fangcheng / regional-platform

Download as
Browse Code »

Commit 93a832b517f667e3f094e956feeef47e5d9a0ff6

Authored by jiangjiazhi
1 parent 9f82f2be11
Exists in master and in 1 other branch nobuildprocess

c

Showing 19 changed files with 756 additions and 536 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/Assert.java View file @ 93a832b
  1 +package com.lyms.platform.common.utils;
  2 +
  3 +import com.lyms.platform.common.exception.BusinessException;
  4 +
  5 +/**
  6 + * 添加类的一句话简单描述。
  7 + * <p>
  8 + * 详细描述
  9 + * <p>
  10 + * 示例代码
  11 + *
  12 + * <pre>
  13 + * </pre>
  14 + *
  15 + * @author In_Home
  16 + * @version BME V100R001 2016-3-21
  17 + * @since BME V100R001C40B104
  18 + */
  19 +public class Assert {
  20 +
  21 + public static void notNull(Object object, String message) {
  22 + if (object == null) {
  23 + throw new BusinessException();
  24 + }
  25 + }
  26 +}
platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ 93a832b
  1 +package com.lyms.platform.common.utils;
  2 +
  3 +/**
  4 + * 添加类的一句话简单描述。
  5 + * <p>
  6 + * 详细描述
  7 + * <p>
  8 + * 示例代码
  9 + *
  10 + * <pre>
  11 + * </pre>
  12 + *
  13 + * @author In_Home
  14 + * @version BME V100R001 2016-3-21
  15 + * @since BME V100R001C40B104
  16 + */
  17 +public final class StringUtils {
  18 +
  19 + public static Object isEmpty(Object obj, Object defaultVal) {
  20 + if (null == obj) {
  21 + return defaultVal;
  22 + }
  23 + return obj;
  24 + }
  25 +}
platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java View file @ 93a832b
... ... @@ -22,23 +22,25 @@
22 22 * @version BME V100R001 2016-3-19
23 23 * @since BME V100R001C40B104
24 24 */
25   -@Document(collection="lyms_babyvisit")
26   -public class BabyVisitModel extends BaseModel
27   -{
  25 +@Document(collection = "lyms_babyvisit")
  26 +public class BabyVisitModel extends BaseModel {
28 27 /**
29 28 *
30 29 */
31 30 private static final long serialVersionUID = 1L;
32   -
  31 +
33 32 /**
34 33 * 母亲的id
35 34 */
36 35 @Field("parentid")
37 36 private String parentId;
  37 +
38 38 @Id
39 39 private String id;
  40 +
40 41 // 名称
41 42 private String name;
  43 +
42 44 // 编号
43 45 private String sNumber;
44 46  
... ... @@ -55,7 +57,7 @@
55 57  
56 58 private String fphone;
57 59  
58   - private String fbirth;
  60 + private Date fbirth;
59 61  
60 62 // 母亲信息
61 63 private String mname;
62 64  
... ... @@ -250,11 +252,11 @@
250 252 this.fphone = fphone;
251 253 }
252 254  
253   - public String getFbirth() {
  255 + public Date getFbirth() {
254 256 return fbirth;
255 257 }
256 258  
257   - public void setFbirth(String fbirth) {
  259 + public void setFbirth(Date fbirth) {
258 260 this.fbirth = fbirth;
259 261 }
260 262  
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 93a832b
... ... @@ -17,14 +17,12 @@
17 17 */
18 18 public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
19 19  
20   -
21   -
22 20 private String id;
23   -
  21 +
24 22 /**
25 23 * 关键字
26 24 */
27   - private String keyword;
  25 + private String keyword;
28 26  
29 27 /**
30 28 * 母亲的id
... ... @@ -51,6 +49,16 @@
51 49 */
52 50 private int visitstatus = -1;
53 51  
  52 + private int yn;
  53 +
  54 + public int getYn() {
  55 + return yn;
  56 + }
  57 +
  58 + public void setYn(int yn) {
  59 + this.yn = yn;
  60 + }
  61 +
54 62 public String getId() {
55 63 return id;
56 64 }
... ... @@ -67,7 +75,6 @@
67 75 this.parentId = parentId;
68 76 }
69 77  
70   -
71 78 public String getKeyword() {
72 79 return keyword;
73 80 }
74 81  
75 82  
76 83  
... ... @@ -112,25 +119,22 @@
112 119 public MongoQuery convertToQuery() {
113 120 MongoCondition condition = MongoCondition.newInstance();
114 121 boolean isAddStart = Boolean.FALSE;
115   -
116   - if(-1!=visitstatus){
117   - condition=condition.and("visitstatus", visitstatus, MongoOper.IS);
  122 +
  123 + if (-1 != visitstatus) {
  124 + condition = condition.and("visitstatus", visitstatus, MongoOper.IS);
118 125 }
119   - if(null!=id){
120   - condition=condition.and("id", id, MongoOper.IS);
  126 + if (null != id) {
  127 + condition = condition.and("id", id, MongoOper.IS);
121 128 }
122   - /* if(null!=keyword){
123   - if(null!=keyword){
124   - MongoCondition con1= MongoCondition.newInstance("phone", keyword, MongoOper.LIKE);
125   - MongoCondition con = MongoCondition.newInstance("name", keyword, MongoOper.LIKE);
126   - condition = condition.orCondition(new MongoCondition[]{con1,con});
127   - }
128   - }*/
129   -
130   - if(null!=parentId){
131   - condition=condition.and("parentId", parentId, MongoOper.IS);
  129 + /*
  130 + * if(null!=keyword){ if(null!=keyword){ MongoCondition con1= MongoCondition.newInstance("phone", keyword, MongoOper.LIKE); MongoCondition con
  131 + * = MongoCondition.newInstance("name", keyword, MongoOper.LIKE); condition = condition.orCondition(new MongoCondition[]{con1,con}); } }
  132 + */
  133 +
  134 + if (null != parentId) {
  135 + condition = condition.and("parentId", parentId, MongoOper.IS);
132 136 }
133   -
  137 +
134 138 Criteria c = null;
135 139 if (null != birthStart) {
136 140 c = Criteria.where("birth").gte(birthStart);
... ... @@ -139,7 +143,7 @@
139 143  
140 144 if (null != birthEnd) {
141 145 if (isAddStart) {
142   - c=c.lte(birthEnd);
  146 + c = c.lte(birthEnd);
143 147 } else {
144 148 c = Criteria.where("birth").lte(birthEnd);
145 149 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ 93a832b
... ... @@ -4,7 +4,6 @@
4 4  
5 5 import org.springframework.beans.factory.annotation.Autowired;
6 6 import org.springframework.stereotype.Controller;
7   -import org.springframework.web.bind.annotation.PathVariable;
8 7 import org.springframework.web.bind.annotation.RequestMapping;
9 8 import org.springframework.web.bind.annotation.RequestMethod;
10 9 import org.springframework.web.bind.annotation.RequestParam;
... ... @@ -14,7 +13,6 @@
14 13 import com.lyms.platform.common.result.BaseResponse;
15 14 import com.lyms.platform.operate.web.facade.PuerperaManagerFacade;
16 15 import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest;
17   -import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest;
18 16  
19 17 /**
20 18 * 产妇管理接口
... ... @@ -65,11 +63,11 @@
65 63 *
66 64 * @return 返回结果
67 65 */
68   - @RequestMapping(value = "/puerperamanage/{id}", method = RequestMethod.PUT)
69   - @ResponseBody
70   - public BaseResponse updatePuerperaManager(@PathVariable("id") String id,@Valid PuerperaManagerUpdateRequest puerperaManagerUpdateRequest) {
71   - puerperaManagerUpdateRequest.setId(id);
72   - return puerperaManagerFacade.updateOnePuerperaData(puerperaManagerUpdateRequest);
73   - }
  66 + /*
  67 + * @RequestMapping(value = "/puerperamanage/{id}", method = RequestMethod.PUT)
  68 + * @ResponseBody public BaseResponse updatePuerperaManager(@PathVariable("id") String id,@Valid PuerperaManagerUpdateRequest
  69 + * puerperaManagerUpdateRequest) { puerperaManagerUpdateRequest.setId(id); return
  70 + * puerperaManagerFacade.updateOnePuerperaData(puerperaManagerUpdateRequest); }
  71 + */
74 72 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java View file @ 93a832b
... ... @@ -2,12 +2,12 @@
2 2  
3 3 import javax.validation.Valid;
4 4  
  5 +import org.apache.commons.lang.StringUtils;
5 6 import org.springframework.beans.factory.annotation.Autowired;
6 7 import org.springframework.stereotype.Controller;
7 8 import org.springframework.web.bind.annotation.PathVariable;
8 9 import org.springframework.web.bind.annotation.RequestMapping;
9 10 import org.springframework.web.bind.annotation.RequestMethod;
10   -import org.springframework.web.bind.annotation.RequestParam;
11 11 import org.springframework.web.bind.annotation.ResponseBody;
12 12  
13 13 import com.lyms.platform.common.constants.ErrorCodeConstants;
... ... @@ -15,6 +15,7 @@
15 15 import com.lyms.platform.common.result.BaseResponse;
16 16 import com.lyms.platform.operate.web.facade.VisitFacade;
17 17 import com.lyms.platform.operate.web.request.BabyVisitAddRequest;
  18 +import com.lyms.platform.operate.web.request.PuerperaVisitQueryRequest;
18 19 import com.lyms.platform.operate.web.request.VisitAddRequest;
19 20  
20 21 /**
21 22  
22 23  
23 24  
24 25  
25 26  
26 27  
27 28  
28 29  
29 30  
30 31  
31 32  
32 33  
33 34  
34 35  
35 36  
36 37  
37 38  
38 39  
39 40  
... ... @@ -23,77 +24,107 @@
23 24 * @author Administrator
24 25 */
25 26 @Controller
26   -public class VisitController extends RestController{
27   -
  27 +public class VisitController extends RestController {
  28 +
28 29 @Autowired
29 30 private VisitFacade visitFacade;
30 31  
31 32 /**
32 33 * 根据身份证获取产妇信息
33 34 *
34   - * @param cardno 身份证号码
35   - *
  35 + * @param cardno
  36 + * 身份证号码
36 37 * @return 返回结果
37 38 */
38 39 @RequestMapping(value = "/visitpuerpera", method = RequestMethod.GET)
39 40 @ResponseBody
40   - public BaseObjectResponse findOneByCardNo(@RequestParam("cardno")String cardno) {
41   - return visitFacade.findOneByCardNo(cardno);
  41 + public BaseObjectResponse findOneByCardNo(PuerperaVisitQueryRequest puerperaVisitQueryRequest) {
  42 + // 身份证号不为空的情况
  43 + if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getCardNo())) {
  44 + // 根据身份证号码去查询
  45 + return visitFacade.findOneByCardNo(puerperaVisitQueryRequest.getCardNo());
  46 + } else if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getId())) {
  47 + // 根据产妇的id去查询
  48 + return visitFacade.findOneById(puerperaVisitQueryRequest.getId());
  49 + }
  50 + return new BaseObjectResponse().setErrormsg("参数错误,cardno/id 不能都为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
42 51 }
43 52  
44 53 /**
45   - * 增加访视记录
  54 + * 增加产妇访视记录
46 55 *
47   - * @param visitAddRequest 访视记录请求
48   - *
  56 + * @param visitAddRequest
  57 + * 访视记录请求
49 58 * @return 返回结果
50 59 */
51 60 @ResponseBody
52 61 @RequestMapping(value = "/visitpuerpera", method = RequestMethod.POST)
53   - public BaseResponse addOneVisit(@Valid VisitAddRequest visitAddRequest) {
  62 + public BaseResponse addOneVisit(@Valid
  63 + VisitAddRequest visitAddRequest) {
54 64 return visitFacade.addOneVisit(visitAddRequest);
55 65 }
56   -
  66 +
57 67 /**
58   - *
59 68 * 增加一条小孩的访视记录
60 69 *
61   - * @param babyVisitAddRequest 小孩的访视记录请求
62   - *
  70 + * @param babyVisitAddRequest
  71 + * 小孩的访视记录请求
63 72 * @return 返回结果
64 73 */
65 74 @ResponseBody
66 75 @RequestMapping(value = "/visitbaby", method = RequestMethod.POST)
67   - public BaseResponse addOneBabyVisit(@Valid BabyVisitAddRequest babyVisitAddRequest){
  76 + public BaseResponse addOneBabyVisit(@Valid
  77 + BabyVisitAddRequest babyVisitAddRequest) {
68 78 return visitFacade.addOneBabyVisit(babyVisitAddRequest);
69 79 }
70   -
  80 +
71 81 /**
72   - *
73 82 * 根据产妇身份证号获取小孩的访视信息
74 83 *
75   - * @param cardno 产妇身份证号码
76   - *
  84 + * @param PuerperaVisitQueryRequest
  85 + * 访视记录查询
77 86 * @return
78 87 */
79 88 @RequestMapping(value = "/visitbaby", method = RequestMethod.GET)
80 89 @ResponseBody
81   - public BaseObjectResponse findOneBabyByCardNo(@RequestParam("cardno")String cardno) {
82   - return visitFacade.findBabyVisitByMotherCardNo(cardno);
  90 + public BaseObjectResponse findOneBabyByCardNo(PuerperaVisitQueryRequest puerperaVisitQueryRequest) {
  91 + // 根据产妇的身份证号码查询小孩的记录
  92 + if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getCardNo())) {
  93 + return visitFacade.findBabyVisitByMotherCardNo(puerperaVisitQueryRequest.getCardNo());
  94 + // 根据小孩的id去获取访视记录
  95 + } else if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getId())) {
  96 + return visitFacade.findBabyVisitByBabyId(puerperaVisitQueryRequest.getId());
  97 + }
  98 + return new BaseObjectResponse().setErrormsg("参数错误,cardno/id 不能都为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
83 99 }
84   -
  100 +
85 101 /**
  102 + * 修改一条小孩访视记录
86 103 *
87   - * 修改一条访视记录
  104 + * @param id
  105 + * 访视记录
  106 + * @return 操作结果
  107 + */
  108 + @RequestMapping(value = "/visitbaby/{id}", method = RequestMethod.PUT)
  109 + @ResponseBody
  110 + public BaseResponse updateOneBabyVisit(@PathVariable("id")
  111 + String id, BabyVisitAddRequest babyVisitAddRequest) {
  112 + babyVisitAddRequest.setId(id);
  113 + return visitFacade.addOrUpdateBabyAndVisit(babyVisitAddRequest);
  114 + }
  115 +
  116 + /**
  117 + * 修改一条产妇访视记录
88 118 *
89   - * @param id 访视记录
90   - *
  119 + * @param id
  120 + * 访视记录
91 121 * @return 操作结果
92 122 */
93   - @RequestMapping(value="/visitbaby/{id}",method=RequestMethod.PUT)
  123 + @RequestMapping(value = "/visitpuerpera/{id}", method = RequestMethod.PUT)
94 124 @ResponseBody
95   - public BaseResponse updateOneBabyVisit(@PathVariable("id")String id){
96   - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  125 + public BaseResponse updateOnePuerperaVisit(@PathVariable("id")
  126 + String id, VisitAddRequest visitAddRequest) {
  127 + return visitFacade.addOneVisit(visitAddRequest);
97 128 }
98 129 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java View file @ 93a832b
... ... @@ -25,103 +25,101 @@
25 25  
26 26 @Component
27 27 public class BabyManagerFacade {
28   -
29   -
  28 +
30 29 @Autowired
31 30 private PuerperaService puerperaService;
  31 +
32 32 @Autowired
33 33 private BabyService babyService;
34   -
35   -
36   -
  34 +
37 35 /**
38 36 * 根据条件查询符合条件的新生儿
39 37 *
40 38 * @param babyManagerRequest
41 39 * @return
42 40 */
43   - public BaseListResponse findBabyList(BabyManagerQueryRequest babyManagerRequest){
44   -
45   - BabyModelQuery babyQuery = new BabyModelQuery();
  41 + public BaseListResponse findBabyList(BabyManagerQueryRequest babyManagerRequest) {
  42 +
  43 + BabyModelQuery babyQuery = new BabyModelQuery();
46 44 babyQuery.setBirthEnd(babyManagerRequest.getdEnd());
47 45 babyQuery.setBirthStart(babyManagerRequest.getdStart());
48 46 babyQuery.setVisitstatus(babyManagerRequest.getVisitstatus());
49 47 babyQuery.setPage(babyManagerRequest.getPage());
50 48 babyQuery.setLimit(babyManagerRequest.getLimit());
51   -
  49 + babyQuery.setYn(YnEnums.YES.getId());
52 50 List<BabyResult> data = new ArrayList<BabyResult>();
53   - //根据关键字先查询产妇信息
54   - if(StringUtils.isNotEmpty(babyManagerRequest.getKeyword())){
  51 + // 根据关键字先查询产妇信息
  52 + if (StringUtils.isNotEmpty(babyManagerRequest.getKeyword())) {
55 53 PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
56 54 puerperaQuery.setKeyword(babyManagerRequest.getKeyword());
57   - //符合关键字的产妇列表
  55 + // 符合关键字的产妇列表
58 56 List<PuerperaModel> puerList = puerperaService.queryPuerpera(puerperaQuery);
59   -
60   - if(CollectionUtils.isNotEmpty(puerList)){
61   - for(PuerperaModel model:puerList){
  57 +
  58 + if (CollectionUtils.isNotEmpty(puerList)) {
  59 + for (PuerperaModel model : puerList) {
62 60 babyQuery.setParentId(model.getId());
63   - List<BabyModel> babies= babyService.queryBabyWithQuery(babyQuery);
64   - if(CollectionUtils.isNotEmpty(babies)){
65   - for(BabyModel baby:babies){
  61 + List<BabyModel> babies = babyService.queryBabyWithQuery(babyQuery);
  62 + if (CollectionUtils.isNotEmpty(babies)) {
  63 + for (BabyModel baby : babies) {
66 64 data.add(buildResult(baby, model));
67 65 }
68 66 }
69 67 }
70 68 }
71   - }else{
  69 + } else {
72 70 babyQuery.setNeed("y");
73   - List<BabyModel> babies= babyService.queryBabyWithQuery(babyQuery);
74   - if(CollectionUtils.isNotEmpty(babies)){
75   - for(BabyModel baby:babies){
  71 + List<BabyModel> babies = babyService.queryBabyWithQuery(babyQuery);
  72 + if (CollectionUtils.isNotEmpty(babies)) {
  73 + for (BabyModel baby : babies) {
76 74 data.add(buildResult(baby, puerperaService.findOnePuerperaById(baby.getParentId())));
77 75 }
78 76 }
79 77 }
80   -
  78 +
81 79 return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data);
82 80 }
83   -
  81 +
84 82 /**
85 83 * 删除一条新生儿数据
86 84 *
87   - * @param id 新生儿id
88   - *
  85 + * @param id
  86 + * 新生儿id
89 87 * @return 返回结果
90 88 */
91   - public BaseResponse deleteOneBabyById(String id){
92   - BabyModel obj = new BabyModel();
  89 + public BaseResponse deleteOneBabyById(String id) {
  90 + BabyModel obj = new BabyModel();
93 91 obj.setYn(YnEnums.NO.getId());
94 92 obj.setId(id);
95 93 babyService.updateOneBaby(obj, id);
96 94 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
97 95 }
98   -
99   - public BaseResponse updateOneBaby(BabyManagerUpdateRequest babyManagerUpdateRequest){
  96 +
  97 + public BaseResponse updateOneBaby(BabyManagerUpdateRequest babyManagerUpdateRequest) {
100 98 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
101 99 }
102   -
  100 +
103 101 /**
104   - *
105 102 * 构建放回的数据
  103 + *
106 104 * @param baby
107 105 * @param puerModel
108 106 * @return
109 107 */
110   - public BabyResult buildResult(BabyModel baby,PuerperaModel puerModel){
  108 + public BabyResult buildResult(BabyModel baby, PuerperaModel puerModel) {
111 109 BabyResult babyResult = new BabyResult();
112   -
113   - //填充小孩信息
  110 +
  111 + // 填充小孩信息
114 112 babyResult.convertToResult(baby);
115 113 babyResult.setMotherName(puerModel.getName());
116 114 babyResult.setMotherPhone(puerModel.getPhone());
117   -// HashMap map = (HashMap)JsonUtil.str2Obj(puerModel.getAddress(), HashMap.class);
118   - //需要将数据库中的json结构地址解析出来
119   - HashMap<String,String> map = new HashMap<>();
  115 + // HashMap map = (HashMap)JsonUtil.str2Obj(puerModel.getAddress(), HashMap.class);
  116 + // 需要将数据库中的json结构地址解析出来
  117 + HashMap<String, String> map = new HashMap<>();
120 118 map.put("address", "测试地址");
121 119 babyResult.setAddress(map.get("address").toString());
122 120 babyResult.setParentId(puerModel.getId());
123   - //TODO 需要根据产妇模型上的社区id获取社区信息
124   - babyResult.setCommunity(StringUtils.isEmpty(puerModel.getCommunityId())?"":puerModel.getCommunityId());
  121 + // TODO 需要根据产妇模型上的社区id获取社区信息
  122 + babyResult.setCommunity(StringUtils.isEmpty(puerModel.getCommunityId()) ? "" : puerModel.getCommunityId());
125 123 return babyResult;
126 124 }
127 125 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java View file @ 93a832b
... ... @@ -22,33 +22,33 @@
22 22 * 产妇管理门面
23 23 *
24 24 * @author Administrator
25   - *
26 25 */
27 26 @Component
28 27 public class PuerperaManagerFacade {
29   -
  28 +
30 29 @Autowired
31 30 private PuerperaService puerperaService;
32   -
  31 +
33 32 /**
34 33 * 修改产妇信息
35 34 *
36   - * @param managerUpdateRequest 产妇信息修改请求
  35 + * @param managerUpdateRequest
  36 + * 产妇信息修改请求
37 37 * @return
38 38 */
39   - public BaseResponse updateOnePuerperaData (PuerperaManagerUpdateRequest managerUpdateRequest){
40   -
  39 + public BaseResponse updateOnePuerperaData(PuerperaManagerUpdateRequest managerUpdateRequest) {
  40 +
41 41 puerperaService.updatePuerpera(managerUpdateRequest.convertToDataModel());
42 42 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
43 43 }
44   -
  44 +
45 45 /**
46 46 * 获取符合条件的产妇数据
47 47 *
48 48 * @param managerRequest
49 49 * @return
50 50 */
51   - public BaseListResponse findPuerperaList(PuerperaManagerQueryRequest managerRequest){
  51 + public BaseListResponse findPuerperaList(PuerperaManagerQueryRequest managerRequest) {
52 52 PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
53 53 puerperaQuery.setLimit(managerRequest.getLimit());
54 54 puerperaQuery.setPage(managerRequest.getPage());
55 55  
56 56  
57 57  
58 58  
59 59  
60 60  
... ... @@ -57,33 +57,33 @@
57 57 puerperaQuery.setKeyword(managerRequest.getKeyword());
58 58 puerperaQuery.setCommunityId(managerRequest.getCommunityId());
59 59 puerperaQuery.setVisitstatus(managerRequest.getVisitstatus());
60   -
  60 + puerperaQuery.setYn(YnEnums.YES.getId());
61 61 // 调用service查询
62 62  
63 63 List<PuerperaModel> puerperaList = puerperaService.queryPuerpera(puerperaQuery);
64 64 List<PuerperaResult> data = new ArrayList<PuerperaResult>();
65   - if(CollectionUtils.isNotEmpty(puerperaList)){
66   -
67   - for(PuerperaModel model:puerperaList){
  65 + if (CollectionUtils.isNotEmpty(puerperaList)) {
  66 +
  67 + for (PuerperaModel model : puerperaList) {
68 68 PuerperaResult result = new PuerperaResult();
69 69 data.add(result.convertToResult(model));
70 70 }
71 71 }
72   -
  72 +
73 73 return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data);
74 74 }
75   -
  75 +
76 76 /**
77   - * 删除一条产妇数据
  77 + * 删除一条产妇数据
78 78 *
79   - * @param id 产妇id
80   - *
81   - * @param softDel 是否是软删除 <code>true/false</code>
82   - *
  79 + * @param id
  80 + * 产妇id
  81 + * @param softDel
  82 + * 是否是软删除 <code>true/false</code>
83 83 * @return 处理结果
84 84 */
85   - public BaseResponse deleteOnePuerperaById(String id,boolean softDel){
86   - if(softDel){
  85 + public BaseResponse deleteOnePuerperaById(String id, boolean softDel) {
  86 + if (softDel) {
87 87 PuerperaModel obj = new PuerperaModel();
88 88 obj.setId(id);
89 89 obj.setYn(YnEnums.NO.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java View file @ 93a832b
... ... @@ -8,6 +8,7 @@
8 8 import org.springframework.beans.factory.annotation.Autowired;
9 9 import org.springframework.stereotype.Component;
10 10  
  11 +import com.lyms.platform.biz.service.BabyService;
11 12 import com.lyms.platform.biz.service.BabyVisitService;
12 13 import com.lyms.platform.biz.service.PuerperaService;
13 14 import com.lyms.platform.biz.service.VisitService;
14 15  
15 16  
16 17  
17 18  
18 19  
19 20  
20 21  
21 22  
22 23  
23 24  
24 25  
25 26  
26 27  
27 28  
28 29  
29 30  
30 31  
31 32  
32 33  
33 34  
34 35  
35 36  
36 37  
37 38  
38 39  
39 40  
40 41  
41 42  
42 43  
43 44  
44 45  
45 46  
46 47  
47 48  
48 49  
49 50  
50 51  
51 52  
52 53  
... ... @@ -17,154 +18,209 @@
17 18 import com.lyms.platform.common.result.BaseResponse;
18 19 import com.lyms.platform.operate.web.request.BabyVisitAddRequest;
19 20 import com.lyms.platform.operate.web.request.VisitAddRequest;
  21 +import com.lyms.platform.operate.web.request.VisitAddRequest.SimpleVisitPuerpera;
20 22 import com.lyms.platform.operate.web.result.BabyVisitResult;
21 23 import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit;
22 24 import com.lyms.platform.operate.web.result.SimpleVisit;
23 25 import com.lyms.platform.operate.web.result.VisitResult;
  26 +import com.lyms.platform.pojo.BabyModel;
24 27 import com.lyms.platform.pojo.BabyVisitModel;
25 28 import com.lyms.platform.pojo.PuerperaModel;
26 29 import com.lyms.platform.pojo.VisitModel;
27 30 import com.lyms.platform.query.PuerperaModelQuery;
28 31 import com.lyms.platform.query.VisitQuery;
29 32  
30   -
31 33 /**
32 34 * 产后访视门面
33 35 *
34 36 * @author Administrator
35   - *
36 37 */
37 38 @Component
38 39 public class VisitFacade {
39   -
  40 +
40 41 @Autowired
41 42 private VisitService visitService;
42   -
  43 +
43 44 @Autowired
44 45 private PuerperaService puerperaService;
45   -
  46 +
46 47 @Autowired
47 48 private BabyVisitService babyVisitService;
48   -
  49 +
  50 + @Autowired
  51 + private BabyService babyService;
  52 +
49 53 /**
  54 + * 根据产妇id获取产妇的访视信息
  55 + *
  56 + * @param id
  57 + * @return
  58 + */
  59 + public BaseObjectResponse findOneById(String id) {
  60 + return doBiz(puerperaService.findOnePuerperaById(id));
  61 + }
  62 +
  63 + /**
50 64 * 根据产妇身份证号获取产妇访视记录
51 65 *
52   - * @param cardNo 身份证号
  66 + * @param cardNo
  67 + * 身份证号
53 68 * @return
54 69 */
55   - public BaseObjectResponse findOneByCardNo(String cardNo){
56   -
57   - PuerperaModel puerperaModel = findOnePuerperaByCardNo(cardNo);
58   - VisitResult data = new VisitResult();
59   - if(null!=puerperaModel){
  70 + public BaseObjectResponse findOneByCardNo(String cardNo) {
  71 + return doBiz(findOnePuerperaByCardNo(cardNo));
  72 + }
  73 +
  74 + /**
  75 + * 构建产妇的访视记录信息
  76 + *
  77 + * @param puerperaModel
  78 + * @return
  79 + */
  80 + private BaseObjectResponse doBiz(PuerperaModel puerperaModel) {
  81 + VisitResult data = new VisitResult();
  82 + if (null != puerperaModel) {
60 83 data.convertToResult(puerperaModel);
61 84 VisitQuery visitQuery = new VisitQuery();
62 85 visitQuery.setParentId(puerperaModel.getId());
63   - List<VisitModel> visits=visitService.queryVisit(visitQuery);
64   - List<SimpleVisit> dataList = new ArrayList<>();
65   - if(CollectionUtils.isNotEmpty(visits)){
66   - for(VisitModel visit:visits){
67   - dataList.add(new SimpleVisit().convertToResult(visit));
68   - }
  86 + List<VisitModel> visits = visitService.queryVisit(visitQuery);
  87 + List<SimpleVisit> dataList = new ArrayList<>();
  88 + if (CollectionUtils.isNotEmpty(visits)) {
  89 + for (VisitModel visit : visits) {
  90 + dataList.add(new SimpleVisit().convertToResult(visit));
  91 + }
69 92 }
70 93 data.setData(dataList);
71   - }
72   - else{
  94 + } else {
73 95 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("没有相关的产妇信息.");
74 96 }
75 97 return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
76 98 }
77   -
  99 +
78 100 /**
79 101 * 根据身份证号码获取产妇信息
80 102 *
81   - * @param cardNo 身份证号码
82   - *
  103 + * @param cardNo
  104 + * 身份证号码
83 105 * @return 产妇信息
84 106 */
85 107 private PuerperaModel findOnePuerperaByCardNo(String cardNo) {
86   - PuerperaModelQuery query=new PuerperaModelQuery();
  108 + PuerperaModelQuery query = new PuerperaModelQuery();
87 109 query.setCardNo(cardNo);
88 110 query.setYn(YnEnums.YES.getId());
89   - //根据身份证号找到产妇信息
  111 + // 根据身份证号找到产妇信息
90 112 return puerperaService.findOnePuerperaByCardNo(query);
91 113 }
92   -
  114 +
93 115 /**
  116 + * 增加产妇访视记录
94 117 *
95   - * 增加访视记录
96   - *
97   - * @param visitRequest 访视
98   - *
  118 + * @param visitRequest
  119 + * 产妇访视记录请求
99 120 * @return 返回结果
100 121 */
101   - public BaseResponse addOneVisit(VisitAddRequest visitRequest){
102   - //获取患者id
103   - String parentId=visitRequest.getParentId();
104   - if(StringUtils.isNotEmpty(parentId)){
105   - PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
  122 + public BaseResponse addOneVisit(VisitAddRequest visitRequest) {
  123 + // 获取患者id
  124 + String parentId = visitRequest.getParentId();
  125 + if (StringUtils.isNotEmpty(parentId)) {
  126 + PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
106 127 puerperaQuery.setId(parentId);
107 128 PuerperaModel model;
108 129 List<PuerperaModel> puerList = puerperaService.queryPuerpera(puerperaQuery);
109   - if(CollectionUtils.isNotEmpty(puerList)){
  130 + if (CollectionUtils.isNotEmpty(puerList)) {
110 131 model = puerList.get(0);
111   - PuerperaModel destModel = visitRequest.getPuerpera();
112   - //和数据库里面的对象比较如果不等就表示有修改需存入到数据库中
113   - if(!destModel.equals(model)){
114   - puerperaService.updatePuerpera(visitRequest.getPuerpera());
  132 + SimpleVisitPuerpera destModel = visitRequest.getPuerpera();
  133 + SimpleVisitPuerpera srcModel = visitRequest.new SimpleVisitPuerpera(model);
  134 + // 和数据库里面的对象比较如果不等就表示有修改需存入到数据库中
  135 + if (!destModel.equals(srcModel)) {
  136 + puerperaService.updatePuerpera(visitRequest.getPuerpera().build());
115 137 }
  138 + // 如果为空表示新增
  139 + if (StringUtils.isEmpty(visitRequest.getRequestVisit().getId())) {
  140 + visitService.addVisit(visitRequest.getRequestVisit());
  141 + } else {
  142 + visitService.updateVisit(visitRequest.getRequestVisit());
  143 + }
  144 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  145 + } else {
  146 + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("产妇信息不存在");
116 147 }
117   -
118   - visitService.addVisit(visitRequest.getRequestVisit());
119 148 }
120   -
121   - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  149 + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("产妇id不能为空");
122 150 }
123   -
  151 +
124 152 /**
125   - *
126 153 * 增加一条小孩的访视记录
127   - *
128   - * @param babyVisitAddRequest
  154 + *
  155 + * @param babyVisitAddRequest
129 156 * @return
130 157 */
131   - public BaseResponse addOneBabyVisit( BabyVisitAddRequest babyVisitAddRequest){
132   -
  158 + public BaseResponse addOneBabyVisit(BabyVisitAddRequest babyVisitAddRequest) {
  159 +
133 160 babyVisitService.addOneBabyVisit(babyVisitAddRequest.convertToDataModel());
134   -
  161 +
135 162 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
136 163 }
137   -
  164 +
  165 + public BaseResponse addOrUpdateBabyAndVisit(BabyVisitAddRequest babyVisitAddRequest) {
  166 + // 访视记录id为空表示新增
  167 + if (StringUtils.isEmpty(babyVisitAddRequest.getId())) {
  168 + babyVisitService.addOneBabyVisit(babyVisitAddRequest.convertToDataModel());
  169 + } else {
  170 + babyVisitService.updateOneBabyVisit(babyVisitAddRequest.convertToDataModel(), babyVisitAddRequest.getId());
  171 + }
  172 +
  173 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  174 + }
  175 +
138 176 /**
139   - *
140 177 * 根据产妇的身份证号码获取小孩的访视记录
141 178 *
142   - * @param cardNo 产妇身份证号码
143   - *
  179 + * @param cardNo
  180 + * 产妇身份证号码
144 181 */
145   - public BaseObjectResponse findBabyVisitByMotherCardNo(String cardNo){
146   - //根据身份证号获取到产妇信息
147   - PuerperaModel puerperaModel = findOnePuerperaByCardNo(cardNo);
148   - if(null==puerperaModel){
  182 + public BaseObjectResponse findBabyVisitByMotherCardNo(String cardNo) {
  183 + // 根据身份证号获取到产妇信息
  184 + PuerperaModel puerperaModel = findOnePuerperaByCardNo(cardNo);
  185 + if (null == puerperaModel) {
149 186 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("产妇信息不存在");
150 187 }
151   - //根据产妇id查询该产妇下的小孩访视
152   - List<BabyVisitModel> babyVisits = babyVisitService.findAllVisitByParentId(puerperaModel.getId());
153   -
154   - //数据转换
  188 + return findBabyVisit(puerperaModel);
  189 + }
  190 +
  191 + private BaseObjectResponse findBabyVisit(PuerperaModel puerperaModel) {
  192 + // 根据产妇id查询该产妇下的小孩访视
  193 + List<BabyVisitModel> babyVisits = babyVisitService.findAllVisitByParentId(puerperaModel.getId());
  194 +
  195 + // 数据转换
155 196 BabyVisitResult babyVisitResult = new BabyVisitResult();
156   - List<BabyVisitResult.BabyVisit> data =new ArrayList<BabyVisitResult.BabyVisit>();
157   - for(BabyVisitModel visit:babyVisits){
  197 + List<BabyVisitResult.BabyVisit> data = new ArrayList<BabyVisitResult.BabyVisit>();
  198 + for (BabyVisitModel visit : babyVisits) {
158 199 BabyVisit babyVisit = babyVisitResult.new BabyVisit();
159   - //转换小孩的访视数据
  200 + // 转换小孩的访视数据
160 201 data.add(babyVisit.convertToResult(visit));
161 202 }
162   -
163   - //TODO 需要转换成具体的result对象
164   - //设置产妇的信息
  203 +
  204 + // TODO 需要转换成具体的result对象
  205 + // 设置产妇的信息
165 206 babyVisitResult.convertToResult(puerperaModel);
166 207 babyVisitResult.setData(data);
167 208 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(babyVisitResult);
  209 + }
  210 +
  211 + /**
  212 + * 根据小孩id查询
  213 + *
  214 + * @param babyId
  215 + * @return
  216 + */
  217 + public BaseObjectResponse findBabyVisitByBabyId(String babyId) {
  218 + BabyModel babyModel = babyService.getOneBabyById(babyId);
  219 + if (null == babyModel) {
  220 + return new BaseObjectResponse().setErrormsg("找不到相关的新生儿数据");
  221 + }
  222 + PuerperaModel model = puerperaService.findOnePuerperaById(babyModel.getParentId());
  223 + return findBabyVisit(model);
168 224 }
169 225 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java View file @ 93a832b
... ... @@ -24,7 +24,6 @@
24 24 @FormParam
25 25 private String keyword;
26 26  
27   -
28 27 /**
29 28 * 访视状态
30 29 */
31 30  
32 31  
... ... @@ -34,17 +33,15 @@
34 33 /**
35 34 * 生日开始
36 35 */
37   - @FormParam
  36 + @FormParam("dstart")
38 37 private Date dStart;
39 38  
40 39 /**
41 40 * 生日结束
42 41 */
43   - @FormParam
  42 + @FormParam("dend")
44 43 private Date dEnd;
45 44  
46   -
47   -
48 45 public String getKeyword() {
49 46 return keyword;
50 47 }
... ... @@ -60,7 +57,7 @@
60 57 public void setVisitstatus(int visitstatus) {
61 58 this.visitstatus = visitstatus;
62 59 }
63   -
  60 +
64 61 public Date getdStart() {
65 62 return dStart;
66 63 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java View file @ 93a832b
... ... @@ -7,13 +7,15 @@
7 7 import com.lyms.platform.pojo.BabyVisitModel;
8 8  
9 9 @Form
10   -public class BabyVisitAddRequest implements IBasicRequestConvert<BabyVisitModel>{
  10 +public class BabyVisitAddRequest implements IBasicRequestConvert<BabyVisitModel> {
11 11 /**
12 12 * 母亲的id
13 13 */
14 14 private String parentId;
  15 +
15 16 // 名称
16 17 private String name;
  18 +
17 19 // 编号
18 20 private String sNumber;
19 21  
20 22  
21 23  
22 24  
23 25  
24 26  
25 27  
26 28  
27 29  
28 30  
29 31  
30 32  
31 33  
32 34  
33 35  
34 36  
35 37  
36 38  
37 39  
38 40  
39 41  
40 42  
41 43  
42 44  
43 45  
44 46  
45 47  
46 48  
47 49  
48 50  
49 51  
50 52  
51 53  
52 54  
53 55  
54 56  
55 57  
56 58  
57 59  
58 60  
59 61  
60 62  
61 63  
62 64  
63 65  
64 66  
65 67  
66 68  
67 69  
68 70  
69 71  
70 72  
71 73  
72 74  
73 75  
74 76  
75 77  
76 78  
77 79  
78 80  
79 81  
80 82  
81 83  
82 84  
83 85  
84 86  
85 87  
86 88  
87 89  
88 90  
89 91  
90 92  
91 93  
92 94  
93 95  
94 96  
95 97  
96 98  
97 99  
98 100  
99 101  
100 102  
101 103  
102 104  
103 105  
104 106  
105 107  
106 108  
107 109  
108 110  
109 111  
110 112  
111 113  
112 114  
113 115  
114 116  
115 117  
116 118  
117 119  
118 120  
119 121  
120 122  
121 123  
122 124  
123 125  
124 126  
125 127  
126 128  
127 129  
128 130  
129 131  
130 132  
131 133  
... ... @@ -168,683 +170,468 @@
168 170  
169 171 // 随访医生签名
170 172 private String doctorSign;
171   -
172   -
173   -
  173 +
  174 + // 访视记录id
  175 + private String id;
  176 +
  177 + public String getId() {
  178 + return id;
  179 + }
  180 +
  181 + public void setId(String id) {
  182 + this.id = id;
  183 + }
  184 +
174 185 public String getParentId() {
175 186 return parentId;
176 187 }
177 188  
178   -
179   -
180 189 public void setParentId(String parentId) {
181 190 this.parentId = parentId;
182 191 }
183 192  
184   -
185   -
186 193 public String getName() {
187 194 return name;
188 195 }
189 196  
190   -
191   -
192 197 public void setName(String name) {
193 198 this.name = name;
194 199 }
195 200  
196   -
197   -
198 201 public String getsNumber() {
199 202 return sNumber;
200 203 }
201 204  
202   -
203   -
204 205 public void setsNumber(String sNumber) {
205 206 this.sNumber = sNumber;
206 207 }
207 208  
208   -
209   -
210 209 public int getSex() {
211 210 return sex;
212 211 }
213 212  
214   -
215   -
216 213 public void setSex(int sex) {
217 214 this.sex = sex;
218 215 }
219 216  
220   -
221   -
222 217 public Date getBirth() {
223 218 return birth;
224 219 }
225 220  
226   -
227   -
228 221 public void setBirth(Date birth) {
229 222 this.birth = birth;
230 223 }
231 224  
232   -
233   -
234 225 public String getFname() {
235 226 return fname;
236 227 }
237 228  
238   -
239   -
240 229 public void setFname(String fname) {
241 230 this.fname = fname;
242 231 }
243 232  
244   -
245   -
246 233 public String getFjob() {
247 234 return fjob;
248 235 }
249 236  
250   -
251   -
252 237 public void setFjob(String fjob) {
253 238 this.fjob = fjob;
254 239 }
255 240  
256   -
257   -
258 241 public String getFphone() {
259 242 return fphone;
260 243 }
261 244  
262   -
263   -
264 245 public void setFphone(String fphone) {
265 246 this.fphone = fphone;
266 247 }
267 248  
268   -
269   -
270 249 public String getFbirth() {
271 250 return fbirth;
272 251 }
273 252  
274   -
275   -
276 253 public void setFbirth(String fbirth) {
277 254 this.fbirth = fbirth;
278 255 }
279 256  
280   -
281   -
282 257 public String getMname() {
283 258 return mname;
284 259 }
285 260  
286   -
287   -
288 261 public void setMname(String mname) {
289 262 this.mname = mname;
290 263 }
291 264  
292   -
293   -
294 265 public String getMjob() {
295 266 return mjob;
296 267 }
297 268  
298   -
299   -
300 269 public void setMjob(String mjob) {
301 270 this.mjob = mjob;
302 271 }
303 272  
304   -
305   -
306 273 public String getMphone() {
307 274 return mphone;
308 275 }
309 276  
310   -
311   -
312 277 public void setMphone(String mphone) {
313 278 this.mphone = mphone;
314 279 }
315 280  
316   -
317   -
318 281 public Date getMbirth() {
319 282 return mbirth;
320 283 }
321 284  
322   -
323   -
324 285 public void setMbirth(Date mbirth) {
325 286 this.mbirth = mbirth;
326 287 }
327 288  
328   -
329   -
330 289 public int getWeek() {
331 290 return week;
332 291 }
333 292  
334   -
335   -
336 293 public void setWeek(int week) {
337 294 this.week = week;
338 295 }
339 296  
340   -
341   -
342 297 public String getSickenInfo() {
343 298 return sickenInfo;
344 299 }
345 300  
346   -
347   -
348 301 public void setSickenInfo(String sickenInfo) {
349 302 this.sickenInfo = sickenInfo;
350 303 }
351 304  
352   -
353   -
354 305 public String getOrg() {
355 306 return org;
356 307 }
357 308  
358   -
359   -
360 309 public void setOrg(String org) {
361 310 this.org = org;
362 311 }
363 312  
364   -
365   -
366 313 public String getBirthSituation() {
367 314 return birthSituation;
368 315 }
369 316  
370   -
371   -
372 317 public void setBirthSituation(String birthSituation) {
373 318 this.birthSituation = birthSituation;
374 319 }
375 320  
376   -
377   -
378 321 public String getNeonatalAsphyxia() {
379 322 return neonatalAsphyxia;
380 323 }
381 324  
382   -
383   -
384 325 public void setNeonatalAsphyxia(String neonatalAsphyxia) {
385 326 this.neonatalAsphyxia = neonatalAsphyxia;
386 327 }
387 328  
388   -
389   -
390 329 public int getDeformity() {
391 330 return deformity;
392 331 }
393 332  
394   -
395   -
396 333 public void setDeformity(int deformity) {
397 334 this.deformity = deformity;
398 335 }
399 336  
400   -
401   -
402 337 public int getHearing() {
403 338 return hearing;
404 339 }
405 340  
406   -
407   -
408 341 public void setHearing(int hearing) {
409 342 this.hearing = hearing;
410 343 }
411 344  
412   -
413   -
414 345 public int getDisease() {
415 346 return disease;
416 347 }
417 348  
418   -
419   -
420 349 public void setDisease(int disease) {
421 350 this.disease = disease;
422 351 }
423 352  
424   -
425   -
426 353 public double getBirthWeight() {
427 354 return birthWeight;
428 355 }
429 356  
430   -
431   -
432 357 public void setBirthWeight(double birthWeight) {
433 358 this.birthWeight = birthWeight;
434 359 }
435 360  
436   -
437   -
438 361 public double getWeight() {
439 362 return weight;
440 363 }
441 364  
442   -
443   -
444 365 public void setWeight(double weight) {
445 366 this.weight = weight;
446 367 }
447 368  
448   -
449   -
450 369 public double getHeight() {
451 370 return height;
452 371 }
453 372  
454   -
455   -
456 373 public void setHeight(double height) {
457 374 this.height = height;
458 375 }
459 376  
460   -
461   -
462 377 public int getFeedType() {
463 378 return feedType;
464 379 }
465 380  
466   -
467   -
468 381 public void setFeedType(int feedType) {
469 382 this.feedType = feedType;
470 383 }
471 384  
472   -
473   -
474 385 public int getEatMilk() {
475 386 return eatMilk;
476 387 }
477 388  
478   -
479   -
480 389 public void setEatMilk(int eatMilk) {
481 390 this.eatMilk = eatMilk;
482 391 }
483 392  
484   -
485   -
486 393 public int getEatTime() {
487 394 return eatTime;
488 395 }
489 396  
490   -
491   -
492 397 public void setEatTime(int eatTime) {
493 398 this.eatTime = eatTime;
494 399 }
495 400  
496   -
497   -
498 401 public int getEmesis() {
499 402 return emesis;
500 403 }
501 404  
502   -
503   -
504 405 public void setEmesis(int emesis) {
505 406 this.emesis = emesis;
506 407 }
507 408  
508   -
509   -
510 409 public String getShit() {
511 410 return shit;
512 411 }
513 412  
514   -
515   -
516 413 public void setShit(String shit) {
517 414 this.shit = shit;
518 415 }
519 416  
520   -
521   -
522 417 public int getShitTimeOfDay() {
523 418 return shitTimeOfDay;
524 419 }
525 420  
526   -
527   -
528 421 public void setShitTimeOfDay(int shitTimeOfDay) {
529 422 this.shitTimeOfDay = shitTimeOfDay;
530 423 }
531 424  
532   -
533   -
534 425 public double getTemperature() {
535 426 return temperature;
536 427 }
537 428  
538   -
539   -
540 429 public void setTemperature(double temperature) {
541 430 this.temperature = temperature;
542 431 }
543 432  
544   -
545   -
546 433 public double getHeartRate() {
547 434 return heartRate;
548 435 }
549 436  
550   -
551   -
552 437 public void setHeartRate(double heartRate) {
553 438 this.heartRate = heartRate;
554 439 }
555 440  
556   -
557   -
558 441 public double getRespiratoryRate() {
559 442 return respiratoryRate;
560 443 }
561 444  
562   -
563   -
564 445 public void setRespiratoryRate(double respiratoryRate) {
565 446 this.respiratoryRate = respiratoryRate;
566 447 }
567 448  
568   -
569   -
570 449 public String getComplexion() {
571 450 return complexion;
572 451 }
573 452  
574   -
575   -
576 453 public void setComplexion(String complexion) {
577 454 this.complexion = complexion;
578 455 }
579 456  
580   -
581   -
582 457 public String getJaundiceParts() {
583 458 return JaundiceParts;
584 459 }
585 460  
586   -
587   -
588 461 public void setJaundiceParts(String jaundiceParts) {
589 462 JaundiceParts = jaundiceParts;
590 463 }
591 464  
592   -
593   -
594 465 public String getBregma() {
595 466 return bregma;
596 467 }
597 468  
598   -
599   -
600 469 public void setBregma(String bregma) {
601 470 this.bregma = bregma;
602 471 }
603 472  
604   -
605   -
606 473 public String getEye() {
607 474 return eye;
608 475 }
609 476  
610   -
611   -
612 477 public void setEye(String eye) {
613 478 this.eye = eye;
614 479 }
615 480  
616   -
617   -
618 481 public String getLimbsActivity() {
619 482 return LimbsActivity;
620 483 }
621 484  
622   -
623   -
624 485 public void setLimbsActivity(String limbsActivity) {
625 486 LimbsActivity = limbsActivity;
626 487 }
627 488  
628   -
629   -
630 489 public String getEarAppearance() {
631 490 return earAppearance;
632 491 }
633 492  
634   -
635   -
636 493 public void setEarAppearance(String earAppearance) {
637 494 this.earAppearance = earAppearance;
638 495 }
639 496  
640   -
641   -
642 497 public String getCervicalMass() {
643 498 return cervicalMass;
644 499 }
645 500  
646   -
647   -
648 501 public void setCervicalMass(String cervicalMass) {
649 502 this.cervicalMass = cervicalMass;
650 503 }
651 504  
652   -
653   -
654 505 public String getNose() {
655 506 return nose;
656 507 }
657 508  
658   -
659   -
660 509 public void setNose(String nose) {
661 510 this.nose = nose;
662 511 }
663 512  
664   -
665   -
666 513 public String getSkin() {
667 514 return skin;
668 515 }
669 516  
670   -
671   -
672 517 public void setSkin(String skin) {
673 518 this.skin = skin;
674 519 }
675 520  
676   -
677   -
678 521 public String getMouthCavity() {
679 522 return mouthCavity;
680 523 }
681 524  
682   -
683   -
684 525 public void setMouthCavity(String mouthCavity) {
685 526 this.mouthCavity = mouthCavity;
686 527 }
687 528  
688   -
689   -
690 529 public String getAnus() {
691 530 return anus;
692 531 }
693 532  
694   -
695   -
696 533 public void setAnus(String anus) {
697 534 this.anus = anus;
698 535 }
699 536  
700   -
701   -
702 537 public String getAuscultation() {
703 538 return auscultation;
704 539 }
705 540  
706   -
707   -
708 541 public void setAuscultation(String auscultation) {
709 542 this.auscultation = auscultation;
710 543 }
711 544  
712   -
713   -
714 545 public String getBreast() {
715 546 return breast;
716 547 }
717 548  
718   -
719   -
720 549 public void setBreast(String breast) {
721 550 this.breast = breast;
722 551 }
723 552  
724   -
725   -
726 553 public String getAbdominalPalpation() {
727 554 return abdominalPalpation;
728 555 }
729 556  
730   -
731   -
732 557 public void setAbdominalPalpation(String abdominalPalpation) {
733 558 this.abdominalPalpation = abdominalPalpation;
734 559 }
735 560  
736   -
737   -
738 561 public String getBackbone() {
739 562 return backbone;
740 563 }
741 564  
742   -
743   -
744 565 public void setBackbone(String backbone) {
745 566 this.backbone = backbone;
746 567 }
747 568  
748   -
749   -
750 569 public String getPudendum() {
751 570 return pudendum;
752 571 }
753 572  
754   -
755   -
756 573 public void setPudendum(String pudendum) {
757 574 this.pudendum = pudendum;
758 575 }
759 576  
760   -
761   -
762 577 public String getFunicle() {
763 578 return funicle;
764 579 }
765 580  
766   -
767   -
768 581 public void setFunicle(String funicle) {
769 582 this.funicle = funicle;
770 583 }
771 584  
772   -
773   -
774 585 public String getReferralAdvice() {
775 586 return referralAdvice;
776 587 }
777 588  
778   -
779   -
780 589 public void setReferralAdvice(String referralAdvice) {
781 590 this.referralAdvice = referralAdvice;
782 591 }
783 592  
784   -
785   -
786 593 public String getGuide() {
787 594 return guide;
788 595 }
789 596  
790   -
791   -
792 597 public void setGuide(String guide) {
793 598 this.guide = guide;
794 599 }
795 600  
796   -
797   -
798 601 public Date getCurrentVisit() {
799 602 return currentVisit;
800 603 }
801 604  
802   -
803   -
804 605 public void setCurrentVisit(Date currentVisit) {
805 606 this.currentVisit = currentVisit;
806 607 }
807 608  
808   -
809   -
810 609 public String getNextVisitAddr() {
811 610 return nextVisitAddr;
812 611 }
813 612  
814   -
815   -
816 613 public void setNextVisitAddr(String nextVisitAddr) {
817 614 this.nextVisitAddr = nextVisitAddr;
818 615 }
819 616  
820   -
821   -
822 617 public Date getNextVisitDate() {
823 618 return nextVisitDate;
824 619 }
825 620  
826   -
827   -
828 621 public void setNextVisitDate(Date nextVisitDate) {
829 622 this.nextVisitDate = nextVisitDate;
830 623 }
831 624  
832   -
833   -
834 625 public String getDoctorSign() {
835 626 return doctorSign;
836 627 }
837 628  
838   -
839   -
840 629 public void setDoctorSign(String doctorSign) {
841 630 this.doctorSign = doctorSign;
842 631 }
843 632  
844   -
845   -
846   - public BabyVisitModel convertToDataModel(){
847   - BabyVisitModel babyVisitModel = new BabyVisitModel();
  633 + public BabyVisitModel convertToDataModel() {
  634 + BabyVisitModel babyVisitModel = new BabyVisitModel();
848 635 babyVisitModel.setAbdominalPalpation(abdominalPalpation);
849 636 babyVisitModel.setAnus(anus);
850 637 babyVisitModel.setAuscultation(auscultation);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java View file @ 93a832b
... ... @@ -8,27 +8,35 @@
8 8 @Form
9 9 public class BasicConfigUpdateRequest {
10 10 private String id;
  11 +
11 12 @FormParam
12   - @NotEmpty(message="name不能为空.")
  13 + @NotEmpty(message = "name不能为空.")
13 14 private String name;
  15 +
14 16 @FormParam
15   - @NotEmpty(message="code不能为空.")
  17 + @NotEmpty(message = "code不能为空.")
16 18 private String code;
  19 +
17 20 public String getId() {
18 21 return id;
19 22 }
  23 +
20 24 public void setId(String id) {
21 25 this.id = id;
22 26 }
  27 +
23 28 public String getName() {
24 29 return name;
25 30 }
  31 +
26 32 public void setName(String name) {
27 33 this.name = name;
28 34 }
  35 +
29 36 public String getCode() {
30 37 return code;
31 38 }
  39 +
32 40 public void setCode(String code) {
33 41 this.code = code;
34 42 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java View file @ 93a832b
... ... @@ -27,7 +27,7 @@
27 27 /**
28 28 * 社区名称
29 29 */
30   - @FormParam
  30 + @FormParam("communityid")
31 31 private String communityId;
32 32  
33 33 /**
34 34  
35 35  
... ... @@ -39,15 +39,14 @@
39 39 /**
40 40 * 分娩日期开始
41 41 */
42   - @FormParam
  42 + @FormParam("duedatestart")
43 43 private Date dueDateStart;
44 44  
45 45 /**
46 46 * 分娩日期结束
47 47 */
48   - @FormParam
  48 + @FormParam("duedateend")
49 49 private Date dueDateEnd;
50   -
51 50  
52 51 public String getCommunityId() {
53 52 return communityId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerUpdateRequest.java View file @ 93a832b
... ... @@ -3,9 +3,11 @@
3 3 import java.util.Map;
4 4  
5 5 import com.lyms.platform.common.base.IBasicRequestConvert;
  6 +import com.lyms.platform.common.core.annotation.form.FormParam;
6 7 import com.lyms.platform.common.utils.DateUtil;
7 8 import com.lyms.platform.common.utils.JsonUtil;
8 9 import com.lyms.platform.pojo.PuerperaModel;
  10 +import com.lyms.platform.pojo.VisitModel;
9 11  
10 12 /**
11 13 * 产妇管理修改接口
... ... @@ -13,7 +15,7 @@
13 15 * @author Administrator
14 16 */
15 17 @SuppressWarnings("rawtypes")
16   -public class PuerperaManagerUpdateRequest implements IBasicRequestConvert<PuerperaModel> {
  18 +public class PuerperaManagerUpdateRequest implements IBasicRequestConvert<PuerperaModel> {
17 19  
18 20 // 产妇信息字段 start
19 21 /**
20 22  
21 23  
22 24  
23 25  
... ... @@ -25,15 +27,19 @@
25 27  
26 28 private int age;
27 29  
  30 + @FormParam
28 31 private String cardNo;
29 32  
  33 + @FormParam
30 34 private String dueDate;
31 35  
  36 + @FormParam
32 37 private String dueType;
33 38  
  39 + @FormParam
34 40 private String deliverOrg;
35 41  
36   -
  42 + @FormParam
37 43 private Map address;
38 44  
39 45 // 产妇信息字段 end
... ... @@ -365,6 +371,29 @@
365 371 model.setDueDate(DateUtil.parseYMD(dueDate));
366 372 model.setAddress(JsonUtil.obj2JsonString(address));
367 373 return model;
  374 + }
  375 +
  376 + public VisitModel convertToVisit() {
  377 + VisitModel visitModel = new VisitModel();
  378 + visitModel.setBp(JsonUtil.obj2JsonString(bp));
  379 + visitModel.setBreast(breast);
  380 + visitModel.setChecktime(checktime);
  381 + visitModel.setDays(days);
  382 + visitModel.setDoctorsign(doctorsign);
  383 + visitModel.setDue(due);
  384 + visitModel.setGuide(JsonUtil.obj2JsonString(guide));
  385 + visitModel.setHealth(health);
  386 + visitModel.setLochia(lochia);
  387 + visitModel.setMatrix(matrix);
  388 + visitModel.setMentality(mentality);
  389 + visitModel.setNextvisit(nextvisit);
  390 + visitModel.setNumOfLive(numOfLive);
  391 + visitModel.setOther(other);
  392 + visitModel.setReferral(JsonUtil.obj2JsonString(referral));
  393 + visitModel.setType(type);
  394 + visitModel.setWound(wound);
  395 + visitModel.setXinType(xinType);
  396 + return visitModel;
368 397 }
369 398 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaVisitQueryRequest.java View file @ 93a832b
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +import com.lyms.platform.common.core.annotation.form.Form;
  4 +import com.lyms.platform.common.core.annotation.form.FormParam;
  5 +
  6 +/**
  7 + * 产妇访视查询对象
  8 + * <p>
  9 + * 详细描述
  10 + * <p>
  11 + * 示例代码
  12 + *
  13 + * <pre>
  14 + * </pre>
  15 + *
  16 + * @author In_Home
  17 + * @version BME V100R001 2016-3-21
  18 + * @since BME V100R001C40B104
  19 + */
  20 +@Form
  21 +public class PuerperaVisitQueryRequest {
  22 +
  23 + @FormParam("cardno")
  24 + private String cardNo;
  25 +
  26 + private String id;
  27 +
  28 + public String getCardNo() {
  29 + return cardNo;
  30 + }
  31 +
  32 + public void setCardNo(String cardNo) {
  33 + this.cardNo = cardNo;
  34 + }
  35 +
  36 + public String getId() {
  37 + return id;
  38 + }
  39 +
  40 + public void setId(String id) {
  41 + this.id = id;
  42 + }
  43 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java View file @ 93a832b
... ... @@ -3,6 +3,8 @@
3 3 import java.util.Date;
4 4 import java.util.Map;
5 5  
  6 +import com.lyms.platform.common.core.annotation.form.FormParam;
  7 +import com.lyms.platform.common.utils.DateUtil;
6 8 import com.lyms.platform.common.utils.JsonUtil;
7 9 import com.lyms.platform.pojo.PuerperaModel;
8 10 import com.lyms.platform.pojo.VisitModel;
9 11  
10 12  
11 13  
... ... @@ -34,21 +36,25 @@
34 36 /**
35 37 * 产妇身份证号码
36 38 */
  39 + @FormParam("cardno")
37 40 private String cardNo;
38 41  
39 42 /**
40 43 * 分娩日期
41 44 */
  45 + @FormParam("duedate")
42 46 private String dueDate;
43 47  
44 48 /**
45 49 * 分娩类型
46 50 */
  51 + @FormParam("duetype")
47 52 private String dueType;
48 53  
49 54 /**
50 55 * 助产机构
51 56 */
  57 + @FormParam("deliverorg")
52 58 private String deliverOrg;
53 59  
54 60 /**
... ... @@ -75,6 +81,7 @@
75 81 /**
76 82 * 心法接生
77 83 */
  84 + @FormParam("xintype")
78 85 private int xinType;
79 86  
80 87 /**
81 88  
82 89  
83 90  
... ... @@ -371,29 +378,29 @@
371 378 this.wound = wound;
372 379 }
373 380  
374   - public PuerperaModel getPuerpera() {
375   - PuerperaModel puerperaModel = new PuerperaModel();
376   -
  381 + public SimpleVisitPuerpera getPuerpera() {
  382 + SimpleVisitPuerpera puerperaModel = new SimpleVisitPuerpera();
  383 +
377 384 puerperaModel.setId(parentId);
378 385 puerperaModel.setName(name);
379 386 puerperaModel.setAge(age);
380   - puerperaModel.setCardNo(cardNo);
381   - puerperaModel.setDueDate(new Date());
  387 + puerperaModel.setCardno(cardNo);
  388 + puerperaModel.setDueDate(dueDate);
382 389 puerperaModel.setDeliverOrg(deliverOrg);
383 390 puerperaModel.setDueType(dueType);
384 391 puerperaModel.setAddress(JsonUtil.obj2JsonString(address));
385 392 return puerperaModel;
386 393 }
387   -
388   - public VisitModel getRequestVisit(){
389   - VisitModel visit = new VisitModel();
  394 +
  395 + public VisitModel getRequestVisit() {
  396 + VisitModel visit = new VisitModel();
390 397 try {
391 398 visit.setBp(JsonUtil.obj2JsonString(bp));
392 399 visit.setGuide(JsonUtil.obj2JsonString(guide));
393 400 visit.setReferral(JsonUtil.obj2JsonString(referral));
394 401 } catch (Exception e) {
395 402 }
396   -
  403 +
397 404 visit.setBreast(breast);
398 405 visit.setChecktime(checktime);
399 406 visit.setDays(days);
... ... @@ -411,6 +418,198 @@
411 418 visit.setXinType(xinType);
412 419 visit.setParentId(parentId);
413 420 return visit;
  421 + }
  422 +
  423 + /**
  424 + * 访视记录产妇信息
  425 + * <p>
  426 + * 详细描述
  427 + * <p>
  428 + * 示例代码
  429 + *
  430 + * <pre>
  431 + * </pre>
  432 + *
  433 + * @author In_Home
  434 + * @version BME V100R001 2016-3-21
  435 + * @since BME V100R001C40B104
  436 + */
  437 + public class SimpleVisitPuerpera {
  438 + private String id;
  439 +
  440 + private String name;
  441 +
  442 + private int age;
  443 +
  444 + private String cardno;
  445 +
  446 + private String dueDate;
  447 +
  448 + private String deliverOrg;
  449 +
  450 + private String dueType;
  451 +
  452 + private String address;
  453 +
  454 + public SimpleVisitPuerpera() {
  455 + }
  456 +
  457 + public SimpleVisitPuerpera(PuerperaModel model) {
  458 + id = model.getId();
  459 + name = model.getName();
  460 + age = model.getAge();
  461 + cardno = model.getCardNo();
  462 + dueDate = DateUtil.getyyyy_MM_dd(model.getDueDate());
  463 + deliverOrg = model.getDeliverOrg();
  464 + dueType = model.getDueType();
  465 + address = model.getAddress();
  466 + }
  467 +
  468 + public String getId() {
  469 + return id;
  470 + }
  471 +
  472 + public void setId(String id) {
  473 + this.id = id;
  474 + }
  475 +
  476 + public String getName() {
  477 + return name;
  478 + }
  479 +
  480 + public void setName(String name) {
  481 + this.name = name;
  482 + }
  483 +
  484 + public int getAge() {
  485 + return age;
  486 + }
  487 +
  488 + public void setAge(int age) {
  489 + this.age = age;
  490 + }
  491 +
  492 + public String getCardno() {
  493 + return cardno;
  494 + }
  495 +
  496 + public void setCardno(String cardno) {
  497 + this.cardno = cardno;
  498 + }
  499 +
  500 + public String getDueDate() {
  501 + return dueDate;
  502 + }
  503 +
  504 + public void setDueDate(String dueDate) {
  505 + this.dueDate = dueDate;
  506 + }
  507 +
  508 + public String getDeliverOrg() {
  509 + return deliverOrg;
  510 + }
  511 +
  512 + public void setDeliverOrg(String deliverOrg) {
  513 + this.deliverOrg = deliverOrg;
  514 + }
  515 +
  516 + public String getDueType() {
  517 + return dueType;
  518 + }
  519 +
  520 + public void setDueType(String dueType) {
  521 + this.dueType = dueType;
  522 + }
  523 +
  524 + public String getAddress() {
  525 + return address;
  526 + }
  527 +
  528 + public void setAddress(String address) {
  529 + this.address = address;
  530 + }
  531 +
  532 + public PuerperaModel build() {
  533 + PuerperaModel puerperaModel = new PuerperaModel();
  534 + puerperaModel.setId(parentId);
  535 + puerperaModel.setName(name);
  536 + puerperaModel.setAge(age);
  537 + puerperaModel.setCardNo(cardNo);
  538 + puerperaModel.setDueDate(new Date());
  539 + puerperaModel.setDeliverOrg(deliverOrg);
  540 + puerperaModel.setDueType(dueType);
  541 + puerperaModel.setAddress(JsonUtil.obj2JsonString(address));
  542 + return puerperaModel;
  543 + }
  544 +
  545 + @Override
  546 + public int hashCode() {
  547 + final int prime = 31;
  548 + int result = 1;
  549 + result = prime * result + ((address == null) ? 0 : address.hashCode());
  550 + result = prime * result + age;
  551 + result = prime * result + ((cardno == null) ? 0 : cardno.hashCode());
  552 + result = prime * result + ((deliverOrg == null) ? 0 : deliverOrg.hashCode());
  553 + result = prime * result + ((dueDate == null) ? 0 : dueDate.hashCode());
  554 + result = prime * result + ((dueType == null) ? 0 : dueType.hashCode());
  555 + result = prime * result + ((id == null) ? 0 : id.hashCode());
  556 + result = prime * result + ((name == null) ? 0 : name.hashCode());
  557 + return result;
  558 + }
  559 +
  560 + @Override
  561 + public boolean equals(Object obj) {
  562 + if (this == obj) return true;
  563 + if (obj == null) return false;
  564 + if (getClass() != obj.getClass()) return false;
  565 + SimpleVisitPuerpera other = (SimpleVisitPuerpera) obj;
  566 + if (address == null) {
  567 + if (other.address != null) return false;
  568 + } else if (!address.equals(other.address)) return false;
  569 + if (age != other.age) return false;
  570 + if (cardno == null) {
  571 + if (other.cardno != null) return false;
  572 + } else if (!cardno.equals(other.cardno)) return false;
  573 + if (deliverOrg == null) {
  574 + if (other.deliverOrg != null) return false;
  575 + } else if (!deliverOrg.equals(other.deliverOrg)) return false;
  576 + if (dueDate == null) {
  577 + if (other.dueDate != null) return false;
  578 + } else if (!dueDate.equals(other.dueDate)) return false;
  579 + if (dueType == null) {
  580 + if (other.dueType != null) return false;
  581 + } else if (!dueType.equals(other.dueType)) return false;
  582 + if (id == null) {
  583 + if (other.id != null) return false;
  584 + } else if (!id.equals(other.id)) return false;
  585 + if (name == null) {
  586 + if (other.name != null) return false;
  587 + } else if (!name.equals(other.name)) return false;
  588 + return true;
  589 + }
  590 + }
  591 +
  592 + public static void main(String[] args) {
  593 + SimpleVisitPuerpera puerpera = new VisitAddRequest().new SimpleVisitPuerpera();
  594 + puerpera.setAddress("天府2街");
  595 + puerpera.setAge(1);
  596 + puerpera.setCardno("500311932121545");
  597 + puerpera.setDeliverOrg("西财华西");
  598 + puerpera.setDueDate("2015-05-06");
  599 + puerpera.setDueType("剖腹");
  600 + puerpera.setId("11");
  601 + puerpera.setName("查房");
  602 +
  603 + PuerperaModel model = new PuerperaModel();
  604 + model.setAddress("天府2街");
  605 + model.setAge(1);
  606 + model.setCardNo("500311932121545");
  607 + model.setDeliverOrg("西财华西");
  608 + model.setDueDate(DateUtil.parseYMD("2015-05-07"));
  609 + model.setDueType("剖腹");
  610 + model.setId("11");
  611 + model.setName("查房1");
  612 + System.out.println(puerpera.equals(new VisitAddRequest().new SimpleVisitPuerpera(model)));
414 613 }
415 614 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java View file @ 93a832b
1 1 package com.lyms.platform.operate.web.result;
2 2  
3   -import java.util.Date;
4 3 import java.util.List;
5 4  
6 5 import org.springframework.data.annotation.Id;
7 6  
8 7  
9 8  
10 9  
11 10  
12 11  
13 12  
14 13  
15 14  
16 15  
17 16  
18 17  
19 18  
20 19  
21 20  
22 21  
23 22  
24 23  
25 24  
... ... @@ -11,85 +10,80 @@
11 10 import com.lyms.platform.pojo.PuerperaModel;
12 11  
13 12 /**
14   - *
15 13 * 小孩访视记录的返回对象
16 14 *
17 15 * @author Administrator
18   - *
19 16 */
20   -public class BabyVisitResult implements IBasicResultConvert<BabyVisitResult,PuerperaModel>{
21   -
22   - //母亲的姓名
  17 +public class BabyVisitResult implements IBasicResultConvert<BabyVisitResult, PuerperaModel> {
  18 +
  19 + // 母亲的姓名
23 20 private String mName;
24   - //母亲的身份证号码
  21 +
  22 + // 母亲的身份证号码
25 23 private String mCardNo;
26   - //年龄
  24 +
  25 + // 年龄
27 26 private int age;
28   -
29   - //具体的访视记录
  27 +
  28 + // 产妇的id
  29 + private String parentId;
  30 +
  31 + // 具体的访视记录
30 32 private List<BabyVisit> data;
31   -
  33 +
  34 + public String getParentId() {
  35 + return parentId;
  36 + }
  37 +
  38 + public void setParentId(String parentId) {
  39 + this.parentId = parentId;
  40 + }
  41 +
32 42 public String getmName() {
33 43 return mName;
34 44 }
35 45  
36   -
37   -
38 46 public void setmName(String mName) {
39 47 this.mName = mName;
40 48 }
41 49  
42   -
43   -
44 50 public String getmCardNo() {
45 51 return mCardNo;
46 52 }
47 53  
48   -
49   -
50 54 public void setmCardNo(String mCardNo) {
51 55 this.mCardNo = mCardNo;
52 56 }
53 57  
54   -
55   -
56 58 public int getAge() {
57 59 return age;
58 60 }
59 61  
60   -
61   -
62 62 public void setAge(int age) {
63 63 this.age = age;
64 64 }
65 65  
66   -
67   -
68 66 public List<BabyVisit> getData() {
69 67 return data;
70 68 }
71 69  
72   -
73   -
74 70 public void setData(List<BabyVisit> data) {
75 71 this.data = data;
76 72 }
77 73  
78   -
79   -
80 74 /**
81   - *
82 75 * 小孩的访视记录
83 76 *
84 77 * @author Administrator
85   - *
86 78 */
87   - public class BabyVisit implements IBasicResultConvert<BabyVisit,BabyVisitModel>{
88   -
  79 + public class BabyVisit implements IBasicResultConvert<BabyVisit, BabyVisitModel> {
  80 +
89 81 @Id
90 82 private String id;
  83 +
91 84 // 名称
92 85 private String name;
  86 +
93 87 // 编号
94 88 private String sNumber;
95 89  
... ... @@ -115,7 +109,7 @@
115 109  
116 110 private String mphone;
117 111  
118   - private Date mbirth;
  112 + private String mbirth;
119 113  
120 114 private int week;
121 115  
... ... @@ -138,7 +132,7 @@
138 132 private int hearing;
139 133  
140 134 // 疾病筛查
141   - private int disease;
  135 + private String disease;
142 136  
143 137 // 出生体重
144 138 private double birthWeight;
... ... @@ -165,7 +159,7 @@
165 159 private String shit;
166 160  
167 161 // 大便次数
168   - private int shitTimeOfDay;
  162 + private int shitTimes;
169 163  
170 164 // 体温
171 165 private double temperature;
... ... @@ -189,7 +183,7 @@
189 183 private String eye;
190 184  
191 185 // 四肢活动度
192   - private String LimbsActivity;
  186 + private String limbsActivity;
193 187  
194 188 // 耳外观
195 189 private String earAppearance;
196 190  
... ... @@ -234,13 +228,13 @@
234 228 private String guide;
235 229  
236 230 // 本次访视时间
237   - private Date currentVisit;
  231 + private String currentVisit;
238 232  
239 233 // 下次随访地点
240 234 private String nextVisitAddr;
241 235  
242 236 // 下次访视时间
243   - private Date nextVisitDate;
  237 + private String nextVisitDate;
244 238  
245 239 // 随访医生签名
246 240 private String doctorSign;
247 241  
... ... @@ -341,11 +335,11 @@
341 335 this.mphone = mphone;
342 336 }
343 337  
344   - public Date getMbirth() {
  338 + public String getMbirth() {
345 339 return mbirth;
346 340 }
347 341  
348   - public void setMbirth(Date mbirth) {
  342 + public void setMbirth(String mbirth) {
349 343 this.mbirth = mbirth;
350 344 }
351 345  
352 346  
... ... @@ -405,11 +399,11 @@
405 399 this.hearing = hearing;
406 400 }
407 401  
408   - public int getDisease() {
  402 + public String getDisease() {
409 403 return disease;
410 404 }
411 405  
412   - public void setDisease(int disease) {
  406 + public void setDisease(String disease) {
413 407 this.disease = disease;
414 408 }
415 409  
416 410  
... ... @@ -477,12 +471,12 @@
477 471 this.shit = shit;
478 472 }
479 473  
480   - public int getShitTimeOfDay() {
481   - return shitTimeOfDay;
  474 + public int getShitTimes() {
  475 + return shitTimes;
482 476 }
483 477  
484   - public void setShitTimeOfDay(int shitTimeOfDay) {
485   - this.shitTimeOfDay = shitTimeOfDay;
  478 + public void setShitTimes(int shitTimes) {
  479 + this.shitTimes = shitTimes;
486 480 }
487 481  
488 482 public double getTemperature() {
489 483  
... ... @@ -542,11 +536,11 @@
542 536 }
543 537  
544 538 public String getLimbsActivity() {
545   - return LimbsActivity;
  539 + return limbsActivity;
546 540 }
547 541  
548 542 public void setLimbsActivity(String limbsActivity) {
549   - LimbsActivity = limbsActivity;
  543 + this.limbsActivity = limbsActivity;
550 544 }
551 545  
552 546 public String getEarAppearance() {
... ... @@ -661,14 +655,6 @@
661 655 this.guide = guide;
662 656 }
663 657  
664   - public Date getCurrentVisit() {
665   - return currentVisit;
666   - }
667   -
668   - public void setCurrentVisit(Date currentVisit) {
669   - this.currentVisit = currentVisit;
670   - }
671   -
672 658 public String getNextVisitAddr() {
673 659 return nextVisitAddr;
674 660 }
675 661  
... ... @@ -677,11 +663,19 @@
677 663 this.nextVisitAddr = nextVisitAddr;
678 664 }
679 665  
680   - public Date getNextVisitDate() {
  666 + public String getCurrentVisit() {
  667 + return currentVisit;
  668 + }
  669 +
  670 + public void setCurrentVisit(String currentVisit) {
  671 + this.currentVisit = currentVisit;
  672 + }
  673 +
  674 + public String getNextVisitDate() {
681 675 return nextVisitDate;
682 676 }
683 677  
684   - public void setNextVisitDate(Date nextVisitDate) {
  678 + public void setNextVisitDate(String nextVisitDate) {
685 679 this.nextVisitDate = nextVisitDate;
686 680 }
687 681  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java View file @ 93a832b
... ... @@ -9,74 +9,108 @@
9 9 * 产妇管理结果
10 10 *
11 11 * @author Administrator
12   - *
13 12 */
14 13 public class PuerperaResult {
15 14 private String id;
  15 +
16 16 private String name;
  17 +
17 18 private int age;
  19 +
18 20 private String dueDate;
19   - private String address;
  21 +
  22 + private String address;
  23 +
20 24 private String community;
  25 +
21 26 private String visit;
  27 +
22 28 private String phone;
  29 +
  30 + private int visitStatus;
  31 +
  32 + public int getVisitStatus() {
  33 + return visitStatus;
  34 + }
  35 +
  36 + public void setVisitStatus(int visitStatus) {
  37 + this.visitStatus = visitStatus;
  38 + }
  39 +
23 40 public String getId() {
24 41 return id;
25 42 }
  43 +
26 44 public void setId(String id) {
27 45 this.id = id;
28 46 }
  47 +
29 48 public String getName() {
30 49 return name;
31 50 }
  51 +
32 52 public void setName(String name) {
33 53 this.name = name;
34 54 }
  55 +
35 56 public int getAge() {
36 57 return age;
37 58 }
  59 +
38 60 public void setAge(int age) {
39 61 this.age = age;
40 62 }
  63 +
41 64 public String getDueDate() {
42 65 return dueDate;
43 66 }
  67 +
44 68 public void setDueDate(String dueDate) {
45 69 this.dueDate = dueDate;
46 70 }
  71 +
47 72 public String getAddress() {
48 73 return address;
49 74 }
  75 +
50 76 public void setAddress(String address) {
51 77 this.address = address;
52 78 }
  79 +
53 80 public String getCommunity() {
54 81 return community;
55 82 }
  83 +
56 84 public void setCommunity(String community) {
57 85 this.community = community;
58 86 }
  87 +
59 88 public String getVisit() {
60 89 return visit;
61 90 }
  91 +
62 92 public void setVisit(String visit) {
63 93 this.visit = visit;
64 94 }
65   -
  95 +
66 96 public String getPhone() {
67 97 return phone;
68 98 }
  99 +
69 100 public void setPhone(String phone) {
70 101 this.phone = phone;
71 102 }
72   - public PuerperaResult convertToResult(PuerperaModel model){
  103 +
  104 + public PuerperaResult convertToResult(PuerperaModel model) {
73 105 setAddress(model.getAddress());
74 106 setId(model.getId());
75 107 setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
76   - setVisit(model.getIsVisit()==0 ?"未访视":"已访视");
77   - setCommunity(StringUtils.isEmpty(model.getCommunityId())?"未分配":model.getCommunityId());
  108 + setVisit(model.getIsVisit() == 0 ? "未访视" : "已访视");
  109 + setCommunity(StringUtils.isEmpty(model.getCommunityId()) ? "未分配" : model.getCommunityId());
78 110 setPhone(model.getPhone());
79 111 setAge(model.getAge());
  112 + setName(model.getName());
  113 + setVisitStatus(model.getIsVisit());
80 114 return this;
81 115 }
82 116 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java View file @ 93a832b
... ... @@ -6,101 +6,90 @@
6 6 import com.lyms.platform.common.utils.DateUtil;
7 7 import com.lyms.platform.common.utils.JsonUtil;
8 8 import com.lyms.platform.pojo.PuerperaModel;
  9 +
9 10 @SuppressWarnings("rawtypes")
10 11 public class VisitResult {
11 12 private String name;
12   -
  13 +
13 14 private int age;
  15 +
14 16 private String cardNo;
  17 +
15 18 private String dueDate;
  19 +
16 20 private String dueType;
  21 +
17 22 private String deliverOrg;
18   -
  23 +
19 24 private Map address;
20   -
  25 +
21 26 private List<SimpleVisit> data;
22 27  
23   -
24 28 public String getName() {
25 29 return name;
26 30 }
27 31  
28   -
29 32 public void setName(String name) {
30 33 this.name = name;
31 34 }
32 35  
33   -
34 36 public int getAge() {
35 37 return age;
36 38 }
37 39  
38   -
39 40 public void setAge(int age) {
40 41 this.age = age;
41 42 }
42 43  
43   -
44 44 public String getCardNo() {
45 45 return cardNo;
46 46 }
47 47  
48   -
49 48 public void setCardNo(String cardNo) {
50 49 this.cardNo = cardNo;
51 50 }
52 51  
53   -
54 52 public String getDueDate() {
55 53 return dueDate;
56 54 }
57 55  
58   -
59 56 public void setDueDate(String dueDate) {
60 57 this.dueDate = dueDate;
61 58 }
62 59  
63   -
64 60 public String getDueType() {
65 61 return dueType;
66 62 }
67 63  
68   -
69 64 public void setDueType(String dueType) {
70 65 this.dueType = dueType;
71 66 }
72 67  
73   -
74 68 public String getDeliverOrg() {
75 69 return deliverOrg;
76 70 }
77 71  
78   -
79 72 public void setDeliverOrg(String deliverOrg) {
80 73 this.deliverOrg = deliverOrg;
81 74 }
82 75  
83   -
84 76 public Map getAddress() {
85 77 return address;
86 78 }
87 79  
88   -
89 80 public void setAddress(Map address) {
90 81 this.address = address;
91 82 }
92 83  
93   -
94 84 public List<SimpleVisit> getData() {
95 85 return data;
96 86 }
97 87  
98   -
99 88 public void setData(List<SimpleVisit> data) {
100 89 this.data = data;
101 90 }
102   -
103   - public void convertToResult(PuerperaModel model){
  91 +
  92 + public void convertToResult(PuerperaModel model) {
104 93 try {
105 94 setAddress(JsonUtil.str2Obj(model.getAddress(), Map.class));
106 95 } catch (Exception e) {
... ... @@ -110,6 +99,7 @@
110 99 setDeliverOrg(model.getDeliverOrg());
111 100 setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
112 101 setDueType(model.getDueType());
  102 + setName(model.getName());
113 103 }
114 104 }