shiyang / regional-platform

Download as
Browse Code »

Commit eb845910591ff22f2d71e75e9d39257a34e9a0b1

Authored by jiangjiazhi
2 parents 2cd38534d7 53248a2b92
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 17 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IMatDeliverDao.java View file @ eb84591
... ... @@ -59,5 +59,8 @@
59 59 */
60 60 MaternalDeliverModel getById(String id);
61 61  
  62 + int count(MongoQuery mongoQuery);
  63 +
  64 + List<MaternalDeliverModel> pageQuery(MongoQuery mongoQuery);
62 65 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/MatDeliverDaoImpl.java View file @ eb84591
... ... @@ -60,5 +60,15 @@
60 60 public MaternalDeliverModel getById(String id) {
61 61 return findById(id);
62 62 }
  63 +
  64 + @Override
  65 + public int count(MongoQuery mongoQuery) {
  66 + return (int) super.count(mongoQuery.convertToMongoQuery());
  67 + }
  68 +
  69 + @Override
  70 + public List<MaternalDeliverModel> pageQuery(MongoQuery mongoQuery) {
  71 + return super.find(mongoQuery.convertToMongoQuery());
  72 + }
63 73 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java View file @ eb84591
1 1 package com.lyms.platform.biz.service;
2 2  
3 3 import com.lyms.platform.biz.dal.IMatDeliverDao;
  4 +import com.lyms.platform.common.dao.operator.MongoQuery;
4 5 import com.lyms.platform.common.enums.YnEnums;
5 6 import com.lyms.platform.pojo.MaternalDeliverModel;
6 7 import com.lyms.platform.query.MatDeliverQuery;
... ... @@ -52,6 +53,13 @@
52 53 }
53 54 public MaternalDeliverModel getOneMatDeliver(String id){
54 55 return iMatDeliverDao.getById(id);
  56 + }
  57 +
  58 + public List<MaternalDeliverModel> pageQuery(MatDeliverQuery matDeliverQuery) {
  59 + MongoQuery mongoQuery = matDeliverQuery.convertToQuery();
  60 + matDeliverQuery.mysqlBuild(iMatDeliverDao.count(matDeliverQuery.convertToQuery()));
  61 + mongoQuery.start(matDeliverQuery.getOffset()).end(matDeliverQuery.getLimit());
  62 + return iMatDeliverDao.pageQuery(mongoQuery.addOrder(Sort.Direction.DESC, "dueDate1"));
55 63 }
56 64 }
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ eb84591
... ... @@ -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-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java View file @ eb84591
... ... @@ -8,6 +8,7 @@
8 8 import org.springframework.data.mongodb.core.query.Criteria;
9 9  
10 10 import java.util.Date;
  11 +import java.util.List;
11 12  
12 13 /**
13 14 * 产妇分娩记录查询
... ... @@ -17,6 +18,8 @@
17 18 public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery {
18 19 private String id;
19 20 private String parentId;
  21 + private List<String> parentIdList;
  22 + private String deliveryMode;
20 23 private String vcCardNo;
21 24 private String cardNo;
22 25 private String pid;
... ... @@ -115,6 +118,12 @@
115 118 if (null != parentId) {
116 119 condition = condition.and("parentId", parentId, MongoOper.IS);
117 120 }
  121 + if (null != parentIdList) {
  122 + condition = condition.and("parentId", parentIdList, MongoOper.IN);
  123 + }
  124 + if(null != deliveryMode){
  125 + condition = condition.and("deliveryMode", deliveryMode, MongoOper.IS);
  126 + }
118 127 if (null != hospitalId) {
119 128 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
120 129 }
... ... @@ -190,6 +199,22 @@
190 199  
191 200 public void setYn(Integer yn) {
192 201 this.yn = yn;
  202 + }
  203 +
  204 + public List<String> getParentIdList() {
  205 + return parentIdList;
  206 + }
  207 +
  208 + public void setParentIdList(List<String> parentIdList) {
  209 + this.parentIdList = parentIdList;
  210 + }
  211 +
  212 + public String getDeliveryMode() {
  213 + return deliveryMode;
  214 + }
  215 +
  216 + public void setDeliveryMode(String deliveryMode) {
  217 + this.deliveryMode = deliveryMode;
193 218 }
194 219 }
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ eb84591
... ... @@ -23,6 +23,8 @@
23 23  
24 24 private String id;
25 25  
  26 + private String husbandPhone;
  27 +
26 28 /**
27 29 * 关键字
28 30 */
... ... @@ -1110,6 +1112,14 @@
1110 1112  
1111 1113 public void setVcCardNo(String vcCardNo) {
1112 1114 this.vcCardNo = vcCardNo;
  1115 + }
  1116 +
  1117 + public String getHusbandPhone() {
  1118 + return husbandPhone;
  1119 + }
  1120 +
  1121 + public void setHusbandPhone(String husbandPhone) {
  1122 + this.husbandPhone = husbandPhone;
1113 1123 }
1114 1124 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ eb84591
... ... @@ -4,10 +4,14 @@
4 4 import com.lyms.platform.common.base.BaseController;
5 5 import com.lyms.platform.common.base.LoginContext;
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
  7 +import com.lyms.platform.common.result.BaseListResponse;
7 8 import com.lyms.platform.common.result.BaseResponse;
  9 +import com.lyms.platform.common.utils.ExceptionUtils;
8 10 import com.lyms.platform.operate.web.facade.MatDeliverFacade;
  11 +import com.lyms.platform.operate.web.request.ChildbirthManagerRequest;
9 12 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
10 13 import com.lyms.platform.operate.web.request.MatDeliverQueryRequest;
  14 +import com.lyms.platform.operate.web.result.ChildbirthManagerResult;
11 15 import org.apache.commons.lang.StringUtils;
12 16 import org.springframework.beans.factory.annotation.Autowired;
13 17 import org.springframework.stereotype.Controller;
... ... @@ -96,5 +100,31 @@
96 100 public BaseResponse getEnums(){
97 101 return matDeliverFacade.getEnums();
98 102 }
  103 +
  104 + /**
  105 + * @auther HuJiaqi
  106 + * @createTime 2016年12月07日 14时22分
  107 + * @discription 分娩管理
  108 + */
  109 + @TokenRequired
  110 + @ResponseBody
  111 + @RequestMapping(value = "childbirthManager", method = RequestMethod.POST)
  112 + public BaseListResponse childbirthManager(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest) {
  113 + BaseListResponse baseListResponse;
  114 + try {
  115 + childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
  116 + ChildbirthManagerResult childbirthManagerResult = matDeliverFacade.childbirthManager(childbirthManagerRequest);
  117 + if (childbirthManagerResult.getErrorcode() != ErrorCodeConstants.SUCCESS) {
  118 + baseListResponse = new BaseListResponse().setErrorcode(childbirthManagerResult.getErrorcode()).setErrormsg(childbirthManagerResult.getErrormsg());
  119 + return baseListResponse;
  120 + }
  121 + baseListResponse = new BaseListResponse().setErrorcode(childbirthManagerResult.getErrorcode()).setErrormsg(childbirthManagerResult.getErrormsg()).setData(childbirthManagerResult.getData()).setPageInfo(childbirthManagerResult.getPageInfo());
  122 + } catch (Exception e) {
  123 + baseListResponse = new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
  124 + ExceptionUtils.catchException(e, "childbirthManager异常");
  125 + }
  126 + return baseListResponse;
  127 + }
  128 +
99 129 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java View file @ eb84591
... ... @@ -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 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java View file @ eb84591
... ... @@ -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/MatDeliverFacade.java View file @ eb84591
... ... @@ -5,13 +5,13 @@
5 5 import com.lyms.platform.common.enums.*;
6 6 import com.lyms.platform.common.result.BaseObjectResponse;
7 7 import com.lyms.platform.common.result.BaseResponse;
  8 +import com.lyms.platform.common.utils.BeanUtils;
8 9 import com.lyms.platform.common.utils.DateUtil;
9 10 import com.lyms.platform.common.utils.ExceptionUtils;
  11 +import com.lyms.platform.operate.web.request.ChildbirthManagerRequest;
10 12 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
11 13 import com.lyms.platform.operate.web.request.MatDeliverQueryRequest;
12   -import com.lyms.platform.operate.web.result.HighScoreResult;
13   -import com.lyms.platform.operate.web.result.MatDeliverListResult;
14   -import com.lyms.platform.operate.web.result.MaternalDeliverResult;
  14 +import com.lyms.platform.operate.web.result.*;
15 15 import com.lyms.platform.permission.model.Organization;
16 16 import com.lyms.platform.permission.model.Users;
17 17 import com.lyms.platform.permission.service.OrganizationService;
... ... @@ -914,6 +914,73 @@
914 914 list.add(resultMap);
915 915 }
916 916 return list;
  917 + }
  918 +
  919 + public ChildbirthManagerResult childbirthManager(ChildbirthManagerRequest childbirthManagerRequest) {
  920 + ChildbirthManagerResult childbirthManagerResult = new ChildbirthManagerResult();
  921 +
  922 + PatientsQuery patientsQuery = new PatientsQuery();
  923 +
  924 + patientsQuery.setFmDateStart(DateUtil.parseYMD(childbirthManagerRequest.getStartDate()));
  925 + patientsQuery.setFmDateEnd(DateUtil.parseYMD(childbirthManagerRequest.getEndDate()));
  926 + patientsQuery.setName(childbirthManagerRequest.getUserName());
  927 + patientsQuery.setYn(YnEnums.YES.getId());
  928 + patientsQuery.setType(3);
  929 + // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
  930 + patientsQuery.setCardNo(childbirthManagerRequest.getCardNo());
  931 + patientsQuery.setPhone(childbirthManagerRequest.getPhone());
  932 + patientsQuery.setHusbandPhone(childbirthManagerRequest.getHusbandPhone());
  933 + // 分娩方式去另外一张表查
  934 + List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
  935 + List<String> parentIdList = new ArrayList<>();
  936 + if (patientsList == null || patientsList.size() == 0) {
  937 + // 没有查到，直接抛出
  938 + childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  939 + childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
  940 + return childbirthManagerResult;
  941 + }
  942 + for (Patients patients : patientsList) {
  943 + parentIdList.add(patients.getId());
  944 + }
  945 +
  946 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  947 + matDeliverQuery.setDeliveryMode(childbirthManagerRequest.getDeliveryMode());
  948 + matDeliverQuery.setParentIdList(parentIdList);
  949 + matDeliverQuery.setPage(childbirthManagerRequest.getPage());
  950 + matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
  951 + List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
  952 + if (maternalDeliverModelList == null || maternalDeliverModelList.size() == 0) {
  953 + // 没有查到，直接抛出
  954 + childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  955 + childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
  956 + return childbirthManagerResult;
  957 + }
  958 +
  959 + List<ChildbirthManagerQueryModel> childbirthManagerQueryModelList = new ArrayList<>();
  960 + for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) {
  961 + for (Patients patients : patientsList) {
  962 + if (maternalDeliverModel.getParentId().equals(patients.getId())) {
  963 + // 这里分好了组，开始往结果集里面加数据
  964 + ChildbirthManagerQueryModel childbirthManagerQueryModel = new ChildbirthManagerQueryModel();
  965 + BeanUtils.copy(patients, childbirthManagerQueryModel);
  966 + BeanUtils.copy(maternalDeliverModel, childbirthManagerQueryModel);
  967 + try {
  968 + childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
  969 + } catch (Exception e) {
  970 + // 什么都不干
  971 + }
  972 + childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
  973 + childbirthManagerQueryModelList.add(childbirthManagerQueryModel);
  974 + }
  975 + }
  976 + }
  977 +
  978 + childbirthManagerResult.setData(childbirthManagerQueryModelList);
  979 + childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
  980 + childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  981 + childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
  982 + return childbirthManagerResult;
  983 +
917 984 }
918 985 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ eb84591
... ... @@ -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 @ eb84591
... ... @@ -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  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ eb84591
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +/**
  4 + * @auther HuJiaqi
  5 + * @createTime 2016年12月07日 14时07分
  6 + * @discription
  7 + */
  8 +public class ChildbirthManagerRequest extends BasePageQueryRequest {
  9 +
  10 + /**
  11 + * @auther HuJiaqi
  12 + * @createTime 2016年12月07日 14时13分
  13 + * @discription 产妇姓名
  14 + */
  15 + private String userName;
  16 +
  17 + /**
  18 + * @auther HuJiaqi
  19 + * @createTime 2016年12月07日 14时13分
  20 + * @discription 证件号
  21 + */
  22 + private String cardNo;
  23 +
  24 + /**
  25 + * @auther HuJiaqi
  26 + * @createTime 2016年12月07日 14时13分
  27 + * @discription 联系方式
  28 + */
  29 + private String phone;
  30 +
  31 + private String startDate;
  32 +
  33 + private String endDate;
  34 +
  35 + /**
  36 + * @auther HuJiaqi
  37 + * @createTime 2016年12月07日 14时14分
  38 + * @discription 分娩方式
  39 + */
  40 + private String DeliveryMode;
  41 +
  42 + /**
  43 + * @auther HuJiaqi
  44 + * @createTime 2016年12月07日 15时54分
  45 + * @discription 丈夫联系方式
  46 + */
  47 + private String husbandPhone;
  48 +
  49 + // TODO 高帆说条码号暂时先不管
  50 +
  51 + private Integer operatorId;
  52 +
  53 + public String getUserName() {
  54 + return userName;
  55 + }
  56 +
  57 + public void setUserName(String userName) {
  58 + this.userName = userName;
  59 + }
  60 +
  61 + public String getCardNo() {
  62 + return cardNo;
  63 + }
  64 +
  65 + public void setCardNo(String cardNo) {
  66 + this.cardNo = cardNo;
  67 + }
  68 +
  69 + public String getPhone() {
  70 + return phone;
  71 + }
  72 +
  73 + public void setPhone(String phone) {
  74 + this.phone = phone;
  75 + }
  76 +
  77 + public String getStartDate() {
  78 + return startDate;
  79 + }
  80 +
  81 + public void setStartDate(String startDate) {
  82 + this.startDate = startDate;
  83 + }
  84 +
  85 + public String getEndDate() {
  86 + return endDate;
  87 + }
  88 +
  89 + public void setEndDate(String endDate) {
  90 + this.endDate = endDate;
  91 + }
  92 +
  93 + public String getDeliveryMode() {
  94 + return DeliveryMode;
  95 + }
  96 +
  97 + public void setDeliveryMode(String deliveryMode) {
  98 + DeliveryMode = deliveryMode;
  99 + }
  100 +
  101 + public Integer getOperatorId() {
  102 + return operatorId;
  103 + }
  104 +
  105 + public void setOperatorId(Integer operatorId) {
  106 + this.operatorId = operatorId;
  107 + }
  108 +
  109 + public String getHusbandPhone() {
  110 + return husbandPhone;
  111 + }
  112 +
  113 + public void setHusbandPhone(String husbandPhone) {
  114 + this.husbandPhone = husbandPhone;
  115 + }
  116 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidAddRequest.java View file @ eb84591
... ... @@ -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 @ eb84591
... ... @@ -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/result/ChildbirthManagerQueryModel.java View file @ eb84591
  1 +package com.lyms.platform.operate.web.result;
  2 +
  3 +/**
  4 + * @auther HuJiaqi
  5 + * @createTime 2016年12月07日 15时51分
  6 + * @discription
  7 + */
  8 +public class ChildbirthManagerQueryModel {
  9 +
  10 + /**
  11 + * @auther HuJiaqi
  12 + * @createTime 2016年12月07日 16时36分
  13 + * @discription 分娩日期
  14 + */
  15 + private String dueDate;
  16 +
  17 + /**
  18 + * @auther HuJiaqi
  19 + * @createTime 2016年12月07日 16时36分
  20 + * @discription 姓名
  21 + */
  22 + private String username;
  23 +
  24 + /**
  25 + * @auther HuJiaqi
  26 + * @createTime 2016年12月07日 16时36分
  27 + * @discription 年龄
  28 + */
  29 + private Integer age;
  30 +
  31 + /**
  32 + * @auther HuJiaqi
  33 + * @createTime 2016年12月07日 16时37分
  34 + * @discription 证件号
  35 + */
  36 + private String cardNo;
  37 +
  38 + /**
  39 + * @auther HuJiaqi
  40 + * @createTime 2016年12月07日 16时37分
  41 + * @discription 分娩孕周
  42 + */
  43 + private String dueWeek;
  44 +
  45 + /**
  46 + * @auther HuJiaqi
  47 + * @createTime 2016年12月07日 16时38分
  48 + * @discription 分娩方式
  49 + */
  50 + private String deliveryMode;
  51 +
  52 + /**
  53 + * @auther HuJiaqi
  54 + * @createTime 2016年12月07日 16时38分
  55 + * @discription 产妇情况
  56 + */
  57 + private String maternalInfo;
  58 +
  59 + /**
  60 + * @auther HuJiaqi
  61 + * @createTime 2016年12月07日 16时38分
  62 + * @discription 胎数
  63 + */
  64 + private Integer tireNumber;
  65 +
  66 + /**
  67 + * @auther HuJiaqi
  68 + * @createTime 2016年12月07日 16时39分
  69 + * @discription 活产数
  70 + */
  71 + // TODO 暂未确定
  72 +
  73 + /**
  74 + * @auther HuJiaqi
  75 + * @createTime 2016年12月07日 16时40分
  76 + * @discription 接生医生
  77 + */
  78 + private String deliverDoctor;
  79 +
  80 + /**
  81 + * @auther HuJiaqi
  82 + * @createTime 2016年12月07日 16时41分
  83 + * @discription 联系方式
  84 + */
  85 + private String phone;
  86 +
  87 + public String getDueDate() {
  88 + return dueDate;
  89 + }
  90 +
  91 + public void setDueDate(String dueDate) {
  92 + this.dueDate = dueDate;
  93 + }
  94 +
  95 + public String getUsername() {
  96 + return username;
  97 + }
  98 +
  99 + public void setUsername(String username) {
  100 + this.username = username;
  101 + }
  102 +
  103 + public Integer getAge() {
  104 + return age;
  105 + }
  106 +
  107 + public void setAge(Integer age) {
  108 + this.age = age;
  109 + }
  110 +
  111 + public String getCardNo() {
  112 + return cardNo;
  113 + }
  114 +
  115 + public void setCardNo(String cardNo) {
  116 + this.cardNo = cardNo;
  117 + }
  118 +
  119 + public String getDueWeek() {
  120 + return dueWeek;
  121 + }
  122 +
  123 + public void setDueWeek(String dueWeek) {
  124 + this.dueWeek = dueWeek;
  125 + }
  126 +
  127 + public String getDeliveryMode() {
  128 + return deliveryMode;
  129 + }
  130 +
  131 + public void setDeliveryMode(String deliveryMode) {
  132 + this.deliveryMode = deliveryMode;
  133 + }
  134 +
  135 + public String getMaternalInfo() {
  136 + return maternalInfo;
  137 + }
  138 +
  139 + public void setMaternalInfo(String maternalInfo) {
  140 + this.maternalInfo = maternalInfo;
  141 + }
  142 +
  143 + public Integer getTireNumber() {
  144 + return tireNumber;
  145 + }
  146 +
  147 + public void setTireNumber(Integer tireNumber) {
  148 + this.tireNumber = tireNumber;
  149 + }
  150 +
  151 + public String getDeliverDoctor() {
  152 + return deliverDoctor;
  153 + }
  154 +
  155 + public void setDeliverDoctor(String deliverDoctor) {
  156 + this.deliverDoctor = deliverDoctor;
  157 + }
  158 +
  159 + public String getPhone() {
  160 + return phone;
  161 + }
  162 +
  163 + public void setPhone(String phone) {
  164 + this.phone = phone;
  165 + }
  166 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerResult.java View file @ eb84591
  1 +package com.lyms.platform.operate.web.result;
  2 +
  3 +import com.lyms.platform.common.result.BaseListResponse;
  4 +
  5 +/**
  6 + * @auther HuJiaqi
  7 + * @createTime 2016年12月07日 14时08分
  8 + * @discription
  9 + */
  10 +public class ChildbirthManagerResult extends BaseListResponse {
  11 +}