diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/Assert.java b/platform-common/src/main/java/com/lyms/platform/common/utils/Assert.java
new file mode 100644
index 0000000..a36756a
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/Assert.java
@@ -0,0 +1,26 @@
+package com.lyms.platform.common.utils;
+
+import com.lyms.platform.common.exception.BusinessException;
+
+/**
+ * 添加类的一句话简单描述。
+ *
+ * 详细描述
+ *
+ * 示例代码
+ *
+ *
+ *
+ *
+ * @author In_Home
+ * @version BME V100R001 2016-3-21
+ * @since BME V100R001C40B104
+ */
+public class Assert {
+
+ public static void notNull(Object object, String message) {
+ if (object == null) {
+ throw new BusinessException();
+ }
+ }
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
new file mode 100644
index 0000000..2fd7e13
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
@@ -0,0 +1,25 @@
+package com.lyms.platform.common.utils;
+
+/**
+ * 添加类的一句话简单描述。
+ *
+ * 详细描述
+ *
+ * 示例代码
+ *
+ *
+ *
+ *
+ * @author In_Home
+ * @version BME V100R001 2016-3-21
+ * @since BME V100R001C40B104
+ */
+public final class StringUtils {
+
+ public static Object isEmpty(Object obj, Object defaultVal) {
+ if (null == obj) {
+ return defaultVal;
+ }
+ return obj;
+ }
+}
\ No newline at end of file
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java
index dd5758b..fa8b786 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java
@@ -22,23 +22,25 @@ import com.lyms.platform.common.result.BaseModel;
* @version BME V100R001 2016-3-19
* @since BME V100R001C40B104
*/
-@Document(collection="lyms_babyvisit")
-public class BabyVisitModel extends BaseModel
-{
+@Document(collection = "lyms_babyvisit")
+public class BabyVisitModel extends BaseModel {
/**
*
*/
private static final long serialVersionUID = 1L;
-
+
/**
* 母亲的id
*/
@Field("parentid")
private String parentId;
+
@Id
private String id;
+
// 名称
private String name;
+
// 编号
private String sNumber;
@@ -55,7 +57,7 @@ public class BabyVisitModel extends BaseModel
private String fphone;
- private String fbirth;
+ private Date fbirth;
// 母亲信息
private String mname;
@@ -250,11 +252,11 @@ public class BabyVisitModel extends BaseModel
this.fphone = fphone;
}
- public String getFbirth() {
+ public Date getFbirth() {
return fbirth;
}
- public void setFbirth(String fbirth) {
+ public void setFbirth(Date fbirth) {
this.fbirth = fbirth;
}
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 84e3fb6..403f5f8 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -17,14 +17,12 @@ import com.lyms.platform.common.dao.operator.MongoQuery;
*/
public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
-
-
private String id;
-
+
/**
* 关键字
*/
- private String keyword;
+ private String keyword;
/**
* 母亲的id
@@ -51,6 +49,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
*/
private int visitstatus = -1;
+ private int yn;
+
+ public int getYn() {
+ return yn;
+ }
+
+ public void setYn(int yn) {
+ this.yn = yn;
+ }
+
public String getId() {
return id;
}
@@ -67,7 +75,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
this.parentId = parentId;
}
-
public String getKeyword() {
return keyword;
}
@@ -112,25 +119,22 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
public MongoQuery convertToQuery() {
MongoCondition condition = MongoCondition.newInstance();
boolean isAddStart = Boolean.FALSE;
-
- if(-1!=visitstatus){
- condition=condition.and("visitstatus", visitstatus, MongoOper.IS);
+
+ if (-1 != visitstatus) {
+ condition = condition.and("visitstatus", visitstatus, MongoOper.IS);
}
- if(null!=id){
- condition=condition.and("id", id, MongoOper.IS);
+ if (null != id) {
+ condition = condition.and("id", id, MongoOper.IS);
}
- /* if(null!=keyword){
- if(null!=keyword){
- MongoCondition con1= MongoCondition.newInstance("phone", keyword, MongoOper.LIKE);
- MongoCondition con = MongoCondition.newInstance("name", keyword, MongoOper.LIKE);
- condition = condition.orCondition(new MongoCondition[]{con1,con});
- }
- }*/
-
- if(null!=parentId){
- condition=condition.and("parentId", parentId, MongoOper.IS);
+ /*
+ * if(null!=keyword){ if(null!=keyword){ MongoCondition con1= MongoCondition.newInstance("phone", keyword, MongoOper.LIKE); MongoCondition con
+ * = MongoCondition.newInstance("name", keyword, MongoOper.LIKE); condition = condition.orCondition(new MongoCondition[]{con1,con}); } }
+ */
+
+ if (null != parentId) {
+ condition = condition.and("parentId", parentId, MongoOper.IS);
}
-
+
Criteria c = null;
if (null != birthStart) {
c = Criteria.where("birth").gte(birthStart);
@@ -139,7 +143,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
if (null != birthEnd) {
if (isAddStart) {
- c=c.lte(birthEnd);
+ c = c.lte(birthEnd);
} else {
c = Criteria.where("birth").lte(birthEnd);
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index 25f25b8..90cd5da 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -4,7 +4,6 @@ import javax.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@@ -14,7 +13,6 @@ import com.lyms.platform.common.result.BaseListResponse;
import com.lyms.platform.common.result.BaseResponse;
import com.lyms.platform.operate.web.facade.PuerperaManagerFacade;
import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest;
-import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest;
/**
* 产妇管理接口
@@ -65,10 +63,10 @@ public class PuerperaManageController extends RestController{
*
* @return 返回结果
*/
- @RequestMapping(value = "/puerperamanage/{id}", method = RequestMethod.PUT)
- @ResponseBody
- public BaseResponse updatePuerperaManager(@PathVariable("id") String id,@Valid PuerperaManagerUpdateRequest puerperaManagerUpdateRequest) {
- puerperaManagerUpdateRequest.setId(id);
- return puerperaManagerFacade.updateOnePuerperaData(puerperaManagerUpdateRequest);
- }
+ /*
+ * @RequestMapping(value = "/puerperamanage/{id}", method = RequestMethod.PUT)
+ * @ResponseBody public BaseResponse updatePuerperaManager(@PathVariable("id") String id,@Valid PuerperaManagerUpdateRequest
+ * puerperaManagerUpdateRequest) { puerperaManagerUpdateRequest.setId(id); return
+ * puerperaManagerFacade.updateOnePuerperaData(puerperaManagerUpdateRequest); }
+ */
}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java
index c1b5857..9a83c8b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java
@@ -2,12 +2,12 @@ package com.lyms.platform.operate.web.controller;
import javax.validation.Valid;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.lyms.platform.common.constants.ErrorCodeConstants;
@@ -15,6 +15,7 @@ import com.lyms.platform.common.result.BaseObjectResponse;
import com.lyms.platform.common.result.BaseResponse;
import com.lyms.platform.operate.web.facade.VisitFacade;
import com.lyms.platform.operate.web.request.BabyVisitAddRequest;
+import com.lyms.platform.operate.web.request.PuerperaVisitQueryRequest;
import com.lyms.platform.operate.web.request.VisitAddRequest;
/**
@@ -23,76 +24,106 @@ import com.lyms.platform.operate.web.request.VisitAddRequest;
* @author Administrator
*/
@Controller
-public class VisitController extends RestController{
-
+public class VisitController extends RestController {
+
@Autowired
private VisitFacade visitFacade;
/**
* 根据身份证获取产妇信息
*
- * @param cardno 身份证号码
- *
+ * @param cardno
+ * 身份证号码
* @return 返回结果
*/
@RequestMapping(value = "/visitpuerpera", method = RequestMethod.GET)
@ResponseBody
- public BaseObjectResponse findOneByCardNo(@RequestParam("cardno")String cardno) {
- return visitFacade.findOneByCardNo(cardno);
+ public BaseObjectResponse findOneByCardNo(PuerperaVisitQueryRequest puerperaVisitQueryRequest) {
+ // 身份证号不为空的情况
+ if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getCardNo())) {
+ // 根据身份证号码去查询
+ return visitFacade.findOneByCardNo(puerperaVisitQueryRequest.getCardNo());
+ } else if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getId())) {
+ // 根据产妇的id去查询
+ return visitFacade.findOneById(puerperaVisitQueryRequest.getId());
+ }
+ return new BaseObjectResponse().setErrormsg("参数错误,cardno/id 不能都为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
}
/**
- * 增加访视记录
+ * 增加产妇访视记录
*
- * @param visitAddRequest 访视记录请求
- *
+ * @param visitAddRequest
+ * 访视记录请求
* @return 返回结果
*/
@ResponseBody
@RequestMapping(value = "/visitpuerpera", method = RequestMethod.POST)
- public BaseResponse addOneVisit(@Valid VisitAddRequest visitAddRequest) {
+ public BaseResponse addOneVisit(@Valid
+ VisitAddRequest visitAddRequest) {
return visitFacade.addOneVisit(visitAddRequest);
}
-
+
/**
- *
* 增加一条小孩的访视记录
*
- * @param babyVisitAddRequest 小孩的访视记录请求
- *
+ * @param babyVisitAddRequest
+ * 小孩的访视记录请求
* @return 返回结果
*/
@ResponseBody
@RequestMapping(value = "/visitbaby", method = RequestMethod.POST)
- public BaseResponse addOneBabyVisit(@Valid BabyVisitAddRequest babyVisitAddRequest){
+ public BaseResponse addOneBabyVisit(@Valid
+ BabyVisitAddRequest babyVisitAddRequest) {
return visitFacade.addOneBabyVisit(babyVisitAddRequest);
}
-
+
/**
- *
* 根据产妇身份证号获取小孩的访视信息
*
- * @param cardno 产妇身份证号码
- *
+ * @param PuerperaVisitQueryRequest
+ * 访视记录查询
* @return
*/
@RequestMapping(value = "/visitbaby", method = RequestMethod.GET)
@ResponseBody
- public BaseObjectResponse findOneBabyByCardNo(@RequestParam("cardno")String cardno) {
- return visitFacade.findBabyVisitByMotherCardNo(cardno);
+ public BaseObjectResponse findOneBabyByCardNo(PuerperaVisitQueryRequest puerperaVisitQueryRequest) {
+ // 根据产妇的身份证号码查询小孩的记录
+ if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getCardNo())) {
+ return visitFacade.findBabyVisitByMotherCardNo(puerperaVisitQueryRequest.getCardNo());
+ // 根据小孩的id去获取访视记录
+ } else if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getId())) {
+ return visitFacade.findBabyVisitByBabyId(puerperaVisitQueryRequest.getId());
+ }
+ return new BaseObjectResponse().setErrormsg("参数错误,cardno/id 不能都为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
}
-
+
/**
+ * 修改一条小孩访视记录
*
- * 修改一条访视记录
- *
- * @param id 访视记录
+ * @param id
+ * 访视记录
+ * @return 操作结果
+ */
+ @RequestMapping(value = "/visitbaby/{id}", method = RequestMethod.PUT)
+ @ResponseBody
+ public BaseResponse updateOneBabyVisit(@PathVariable("id")
+ String id, BabyVisitAddRequest babyVisitAddRequest) {
+ babyVisitAddRequest.setId(id);
+ return visitFacade.addOrUpdateBabyAndVisit(babyVisitAddRequest);
+ }
+
+ /**
+ * 修改一条产妇访视记录
*
+ * @param id
+ * 访视记录
* @return 操作结果
*/
- @RequestMapping(value="/visitbaby/{id}",method=RequestMethod.PUT)
+ @RequestMapping(value = "/visitpuerpera/{id}", method = RequestMethod.PUT)
@ResponseBody
- public BaseResponse updateOneBabyVisit(@PathVariable("id")String id){
- return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+ public BaseResponse updateOnePuerperaVisit(@PathVariable("id")
+ String id, VisitAddRequest visitAddRequest) {
+ return visitFacade.addOneVisit(visitAddRequest);
}
}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java
index 4731d11..8ce538c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java
@@ -25,103 +25,101 @@ import com.lyms.platform.query.PuerperaModelQuery;
@Component
public class BabyManagerFacade {
-
-
+
@Autowired
private PuerperaService puerperaService;
+
@Autowired
private BabyService babyService;
-
-
-
+
/**
* 根据条件查询符合条件的新生儿
*
* @param babyManagerRequest
* @return
*/
- public BaseListResponse findBabyList(BabyManagerQueryRequest babyManagerRequest){
-
- BabyModelQuery babyQuery = new BabyModelQuery();
+ public BaseListResponse findBabyList(BabyManagerQueryRequest babyManagerRequest) {
+
+ BabyModelQuery babyQuery = new BabyModelQuery();
babyQuery.setBirthEnd(babyManagerRequest.getdEnd());
babyQuery.setBirthStart(babyManagerRequest.getdStart());
babyQuery.setVisitstatus(babyManagerRequest.getVisitstatus());
babyQuery.setPage(babyManagerRequest.getPage());
babyQuery.setLimit(babyManagerRequest.getLimit());
-
+ babyQuery.setYn(YnEnums.YES.getId());
List data = new ArrayList();
- //根据关键字先查询产妇信息
- if(StringUtils.isNotEmpty(babyManagerRequest.getKeyword())){
+ // 根据关键字先查询产妇信息
+ if (StringUtils.isNotEmpty(babyManagerRequest.getKeyword())) {
PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
puerperaQuery.setKeyword(babyManagerRequest.getKeyword());
- //符合关键字的产妇列表
+ // 符合关键字的产妇列表
List puerList = puerperaService.queryPuerpera(puerperaQuery);
-
- if(CollectionUtils.isNotEmpty(puerList)){
- for(PuerperaModel model:puerList){
+
+ if (CollectionUtils.isNotEmpty(puerList)) {
+ for (PuerperaModel model : puerList) {
babyQuery.setParentId(model.getId());
- List babies= babyService.queryBabyWithQuery(babyQuery);
- if(CollectionUtils.isNotEmpty(babies)){
- for(BabyModel baby:babies){
+ List babies = babyService.queryBabyWithQuery(babyQuery);
+ if (CollectionUtils.isNotEmpty(babies)) {
+ for (BabyModel baby : babies) {
data.add(buildResult(baby, model));
}
}
}
}
- }else{
+ } else {
babyQuery.setNeed("y");
- List babies= babyService.queryBabyWithQuery(babyQuery);
- if(CollectionUtils.isNotEmpty(babies)){
- for(BabyModel baby:babies){
+ List babies = babyService.queryBabyWithQuery(babyQuery);
+ if (CollectionUtils.isNotEmpty(babies)) {
+ for (BabyModel baby : babies) {
data.add(buildResult(baby, puerperaService.findOnePuerperaById(baby.getParentId())));
}
}
}
-
+
return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data);
}
-
+
/**
* 删除一条新生儿数据
*
- * @param id 新生儿id
- *
+ * @param id
+ * 新生儿id
* @return 返回结果
*/
- public BaseResponse deleteOneBabyById(String id){
- BabyModel obj = new BabyModel();
+ public BaseResponse deleteOneBabyById(String id) {
+ BabyModel obj = new BabyModel();
obj.setYn(YnEnums.NO.getId());
obj.setId(id);
babyService.updateOneBaby(obj, id);
return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
-
- public BaseResponse updateOneBaby(BabyManagerUpdateRequest babyManagerUpdateRequest){
+
+ public BaseResponse updateOneBaby(BabyManagerUpdateRequest babyManagerUpdateRequest) {
return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
-
+
/**
- *
* 构建放回的数据
+ *
* @param baby
* @param puerModel
* @return
*/
- public BabyResult buildResult(BabyModel baby,PuerperaModel puerModel){
+ public BabyResult buildResult(BabyModel baby, PuerperaModel puerModel) {
BabyResult babyResult = new BabyResult();
-
- //填充小孩信息
+
+ // 填充小孩信息
babyResult.convertToResult(baby);
babyResult.setMotherName(puerModel.getName());
babyResult.setMotherPhone(puerModel.getPhone());
-// HashMap map = (HashMap)JsonUtil.str2Obj(puerModel.getAddress(), HashMap.class);
- //需要将数据库中的json结构地址解析出来
- HashMap map = new HashMap<>();
+ // HashMap map = (HashMap)JsonUtil.str2Obj(puerModel.getAddress(), HashMap.class);
+ // 需要将数据库中的json结构地址解析出来
+ HashMap map = new HashMap<>();
map.put("address", "测试地址");
babyResult.setAddress(map.get("address").toString());
babyResult.setParentId(puerModel.getId());
- //TODO 需要根据产妇模型上的社区id获取社区信息
- babyResult.setCommunity(StringUtils.isEmpty(puerModel.getCommunityId())?"":puerModel.getCommunityId());
+ // TODO 需要根据产妇模型上的社区id获取社区信息
+ babyResult.setCommunity(StringUtils.isEmpty(puerModel.getCommunityId()) ? "" : puerModel.getCommunityId());
return babyResult;
}
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java
index 682d985..dcc187a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java
@@ -22,33 +22,33 @@ import com.lyms.platform.query.PuerperaModelQuery;
* 产妇管理门面
*
* @author Administrator
- *
*/
@Component
public class PuerperaManagerFacade {
-
+
@Autowired
private PuerperaService puerperaService;
-
+
/**
* 修改产妇信息
*
- * @param managerUpdateRequest 产妇信息修改请求
+ * @param managerUpdateRequest
+ * 产妇信息修改请求
* @return
*/
- public BaseResponse updateOnePuerperaData (PuerperaManagerUpdateRequest managerUpdateRequest){
-
+ public BaseResponse updateOnePuerperaData(PuerperaManagerUpdateRequest managerUpdateRequest) {
+
puerperaService.updatePuerpera(managerUpdateRequest.convertToDataModel());
return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
-
+
/**
* 获取符合条件的产妇数据
*
* @param managerRequest
* @return
*/
- public BaseListResponse findPuerperaList(PuerperaManagerQueryRequest managerRequest){
+ public BaseListResponse findPuerperaList(PuerperaManagerQueryRequest managerRequest) {
PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
puerperaQuery.setLimit(managerRequest.getLimit());
puerperaQuery.setPage(managerRequest.getPage());
@@ -57,33 +57,33 @@ public class PuerperaManagerFacade {
puerperaQuery.setKeyword(managerRequest.getKeyword());
puerperaQuery.setCommunityId(managerRequest.getCommunityId());
puerperaQuery.setVisitstatus(managerRequest.getVisitstatus());
-
+ puerperaQuery.setYn(YnEnums.YES.getId());
// 调用service查询
List puerperaList = puerperaService.queryPuerpera(puerperaQuery);
List data = new ArrayList();
- if(CollectionUtils.isNotEmpty(puerperaList)){
-
- for(PuerperaModel model:puerperaList){
+ if (CollectionUtils.isNotEmpty(puerperaList)) {
+
+ for (PuerperaModel model : puerperaList) {
PuerperaResult result = new PuerperaResult();
data.add(result.convertToResult(model));
}
}
-
+
return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data);
}
-
+
/**
- * 删除一条产妇数据
- *
- * @param id 产妇id
- *
- * @param softDel 是否是软删除 true/false
+ * 删除一条产妇数据
*
+ * @param id
+ * 产妇id
+ * @param softDel
+ * 是否是软删除 true/false
* @return 处理结果
*/
- public BaseResponse deleteOnePuerperaById(String id,boolean softDel){
- if(softDel){
+ public BaseResponse deleteOnePuerperaById(String id, boolean softDel) {
+ if (softDel) {
PuerperaModel obj = new PuerperaModel();
obj.setId(id);
obj.setYn(YnEnums.NO.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
index 95f1506..807c0b5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
@@ -8,6 +8,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import com.lyms.platform.biz.service.BabyService;
import com.lyms.platform.biz.service.BabyVisitService;
import com.lyms.platform.biz.service.PuerperaService;
import com.lyms.platform.biz.service.VisitService;
@@ -17,153 +18,208 @@ import com.lyms.platform.common.result.BaseObjectResponse;
import com.lyms.platform.common.result.BaseResponse;
import com.lyms.platform.operate.web.request.BabyVisitAddRequest;
import com.lyms.platform.operate.web.request.VisitAddRequest;
+import com.lyms.platform.operate.web.request.VisitAddRequest.SimpleVisitPuerpera;
import com.lyms.platform.operate.web.result.BabyVisitResult;
import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit;
import com.lyms.platform.operate.web.result.SimpleVisit;
import com.lyms.platform.operate.web.result.VisitResult;
+import com.lyms.platform.pojo.BabyModel;
import com.lyms.platform.pojo.BabyVisitModel;
import com.lyms.platform.pojo.PuerperaModel;
import com.lyms.platform.pojo.VisitModel;
import com.lyms.platform.query.PuerperaModelQuery;
import com.lyms.platform.query.VisitQuery;
-
/**
* 产后访视门面
*
* @author Administrator
- *
*/
@Component
public class VisitFacade {
-
+
@Autowired
private VisitService visitService;
-
+
@Autowired
private PuerperaService puerperaService;
-
+
@Autowired
private BabyVisitService babyVisitService;
-
+
+ @Autowired
+ private BabyService babyService;
+
+ /**
+ * 根据产妇id获取产妇的访视信息
+ *
+ * @param id
+ * @return
+ */
+ public BaseObjectResponse findOneById(String id) {
+ return doBiz(puerperaService.findOnePuerperaById(id));
+ }
+
/**
* 根据产妇身份证号获取产妇访视记录
*
- * @param cardNo 身份证号
+ * @param cardNo
+ * 身份证号
* @return
*/
- public BaseObjectResponse findOneByCardNo(String cardNo){
-
- PuerperaModel puerperaModel = findOnePuerperaByCardNo(cardNo);
- VisitResult data = new VisitResult();
- if(null!=puerperaModel){
+ public BaseObjectResponse findOneByCardNo(String cardNo) {
+ return doBiz(findOnePuerperaByCardNo(cardNo));
+ }
+
+ /**
+ * 构建产妇的访视记录信息
+ *
+ * @param puerperaModel
+ * @return
+ */
+ private BaseObjectResponse doBiz(PuerperaModel puerperaModel) {
+ VisitResult data = new VisitResult();
+ if (null != puerperaModel) {
data.convertToResult(puerperaModel);
VisitQuery visitQuery = new VisitQuery();
visitQuery.setParentId(puerperaModel.getId());
- List visits=visitService.queryVisit(visitQuery);
- List dataList = new ArrayList<>();
- if(CollectionUtils.isNotEmpty(visits)){
- for(VisitModel visit:visits){
- dataList.add(new SimpleVisit().convertToResult(visit));
- }
+ List visits = visitService.queryVisit(visitQuery);
+ List dataList = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(visits)) {
+ for (VisitModel visit : visits) {
+ dataList.add(new SimpleVisit().convertToResult(visit));
+ }
}
data.setData(dataList);
- }
- else{
+ } else {
return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("没有相关的产妇信息.");
}
return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
-
+
/**
* 根据身份证号码获取产妇信息
*
- * @param cardNo 身份证号码
- *
+ * @param cardNo
+ * 身份证号码
* @return 产妇信息
*/
private PuerperaModel findOnePuerperaByCardNo(String cardNo) {
- PuerperaModelQuery query=new PuerperaModelQuery();
+ PuerperaModelQuery query = new PuerperaModelQuery();
query.setCardNo(cardNo);
query.setYn(YnEnums.YES.getId());
- //根据身份证号找到产妇信息
+ // 根据身份证号找到产妇信息
return puerperaService.findOnePuerperaByCardNo(query);
}
-
+
/**
+ * 增加产妇访视记录
*
- * 增加访视记录
- *
- * @param visitRequest 访视
- *
+ * @param visitRequest
+ * 产妇访视记录请求
* @return 返回结果
*/
- public BaseResponse addOneVisit(VisitAddRequest visitRequest){
- //获取患者id
- String parentId=visitRequest.getParentId();
- if(StringUtils.isNotEmpty(parentId)){
- PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
+ public BaseResponse addOneVisit(VisitAddRequest visitRequest) {
+ // 获取患者id
+ String parentId = visitRequest.getParentId();
+ if (StringUtils.isNotEmpty(parentId)) {
+ PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
puerperaQuery.setId(parentId);
PuerperaModel model;
List puerList = puerperaService.queryPuerpera(puerperaQuery);
- if(CollectionUtils.isNotEmpty(puerList)){
+ if (CollectionUtils.isNotEmpty(puerList)) {
model = puerList.get(0);
- PuerperaModel destModel = visitRequest.getPuerpera();
- //和数据库里面的对象比较如果不等就表示有修改需存入到数据库中
- if(!destModel.equals(model)){
- puerperaService.updatePuerpera(visitRequest.getPuerpera());
+ SimpleVisitPuerpera destModel = visitRequest.getPuerpera();
+ SimpleVisitPuerpera srcModel = visitRequest.new SimpleVisitPuerpera(model);
+ // 和数据库里面的对象比较如果不等就表示有修改需存入到数据库中
+ if (!destModel.equals(srcModel)) {
+ puerperaService.updatePuerpera(visitRequest.getPuerpera().build());
}
+ // 如果为空表示新增
+ if (StringUtils.isEmpty(visitRequest.getRequestVisit().getId())) {
+ visitService.addVisit(visitRequest.getRequestVisit());
+ } else {
+ visitService.updateVisit(visitRequest.getRequestVisit());
+ }
+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+ } else {
+ return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("产妇信息不存在");
}
-
- visitService.addVisit(visitRequest.getRequestVisit());
}
-
- return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+ return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("产妇id不能为空");
}
-
+
/**
- *
* 增加一条小孩的访视记录
- *
- * @param babyVisitAddRequest
+ *
+ * @param babyVisitAddRequest
* @return
*/
- public BaseResponse addOneBabyVisit( BabyVisitAddRequest babyVisitAddRequest){
-
+ public BaseResponse addOneBabyVisit(BabyVisitAddRequest babyVisitAddRequest) {
+
babyVisitService.addOneBabyVisit(babyVisitAddRequest.convertToDataModel());
-
+
return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
-
+
+ public BaseResponse addOrUpdateBabyAndVisit(BabyVisitAddRequest babyVisitAddRequest) {
+ // 访视记录id为空表示新增
+ if (StringUtils.isEmpty(babyVisitAddRequest.getId())) {
+ babyVisitService.addOneBabyVisit(babyVisitAddRequest.convertToDataModel());
+ } else {
+ babyVisitService.updateOneBabyVisit(babyVisitAddRequest.convertToDataModel(), babyVisitAddRequest.getId());
+ }
+
+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+ }
+
/**
- *
* 根据产妇的身份证号码获取小孩的访视记录
*
- * @param cardNo 产妇身份证号码
- *
+ * @param cardNo
+ * 产妇身份证号码
*/
- public BaseObjectResponse findBabyVisitByMotherCardNo(String cardNo){
- //根据身份证号获取到产妇信息
- PuerperaModel puerperaModel = findOnePuerperaByCardNo(cardNo);
- if(null==puerperaModel){
+ public BaseObjectResponse findBabyVisitByMotherCardNo(String cardNo) {
+ // 根据身份证号获取到产妇信息
+ PuerperaModel puerperaModel = findOnePuerperaByCardNo(cardNo);
+ if (null == puerperaModel) {
return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("产妇信息不存在");
}
- //根据产妇id查询该产妇下的小孩访视
- List babyVisits = babyVisitService.findAllVisitByParentId(puerperaModel.getId());
-
- //数据转换
+ return findBabyVisit(puerperaModel);
+ }
+
+ private BaseObjectResponse findBabyVisit(PuerperaModel puerperaModel) {
+ // 根据产妇id查询该产妇下的小孩访视
+ List babyVisits = babyVisitService.findAllVisitByParentId(puerperaModel.getId());
+
+ // 数据转换
BabyVisitResult babyVisitResult = new BabyVisitResult();
- List data =new ArrayList();
- for(BabyVisitModel visit:babyVisits){
+ List data = new ArrayList();
+ for (BabyVisitModel visit : babyVisits) {
BabyVisit babyVisit = babyVisitResult.new BabyVisit();
- //转换小孩的访视数据
+ // 转换小孩的访视数据
data.add(babyVisit.convertToResult(visit));
}
-
- //TODO 需要转换成具体的result对象
- //设置产妇的信息
+
+ // TODO 需要转换成具体的result对象
+ // 设置产妇的信息
babyVisitResult.convertToResult(puerperaModel);
babyVisitResult.setData(data);
return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(babyVisitResult);
}
-}
+
+ /**
+ * 根据小孩id查询
+ *
+ * @param babyId
+ * @return
+ */
+ public BaseObjectResponse findBabyVisitByBabyId(String babyId) {
+ BabyModel babyModel = babyService.getOneBabyById(babyId);
+ if (null == babyModel) {
+ return new BaseObjectResponse().setErrormsg("找不到相关的新生儿数据");
+ }
+ PuerperaModel model = puerperaService.findOnePuerperaById(babyModel.getParentId());
+ return findBabyVisit(model);
+ }
+}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java
index 782a810..f0b748f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java
@@ -24,7 +24,6 @@ public class BabyManagerQueryRequest extends BasePageQueryRequest {
@FormParam
private String keyword;
-
/**
* 访视状态
*/
@@ -34,17 +33,15 @@ public class BabyManagerQueryRequest extends BasePageQueryRequest {
/**
* 生日开始
*/
- @FormParam
+ @FormParam("dstart")
private Date dStart;
/**
* 生日结束
*/
- @FormParam
+ @FormParam("dend")
private Date dEnd;
-
-
public String getKeyword() {
return keyword;
}
@@ -60,7 +57,7 @@ public class BabyManagerQueryRequest extends BasePageQueryRequest {
public void setVisitstatus(int visitstatus) {
this.visitstatus = visitstatus;
}
-
+
public Date getdStart() {
return dStart;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java
index 07821ca..f92917f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java
@@ -7,13 +7,15 @@ import com.lyms.platform.common.core.annotation.form.Form;
import com.lyms.platform.pojo.BabyVisitModel;
@Form
-public class BabyVisitAddRequest implements IBasicRequestConvert{
+public class BabyVisitAddRequest implements IBasicRequestConvert {
/**
* 母亲的id
*/
private String parentId;
+
// 名称
private String name;
+
// 编号
private String sNumber;
@@ -168,683 +170,468 @@ public class BabyVisitAddRequest implements IBasicRequestConvert
// 随访医生签名
private String doctorSign;
-
-
-
- public String getParentId() {
- return parentId;
+
+ // 访视记录id
+ private String id;
+
+ public String getId() {
+ return id;
}
+ public void setId(String id) {
+ this.id = id;
+ }
+ public String getParentId() {
+ return parentId;
+ }
public void setParentId(String parentId) {
this.parentId = parentId;
}
-
-
public String getName() {
return name;
}
-
-
public void setName(String name) {
this.name = name;
}
-
-
public String getsNumber() {
return sNumber;
}
-
-
public void setsNumber(String sNumber) {
this.sNumber = sNumber;
}
-
-
public int getSex() {
return sex;
}
-
-
public void setSex(int sex) {
this.sex = sex;
}
-
-
public Date getBirth() {
return birth;
}
-
-
public void setBirth(Date birth) {
this.birth = birth;
}
-
-
public String getFname() {
return fname;
}
-
-
public void setFname(String fname) {
this.fname = fname;
}
-
-
public String getFjob() {
return fjob;
}
-
-
public void setFjob(String fjob) {
this.fjob = fjob;
}
-
-
public String getFphone() {
return fphone;
}
-
-
public void setFphone(String fphone) {
this.fphone = fphone;
}
-
-
public String getFbirth() {
return fbirth;
}
-
-
public void setFbirth(String fbirth) {
this.fbirth = fbirth;
}
-
-
public String getMname() {
return mname;
}
-
-
public void setMname(String mname) {
this.mname = mname;
}
-
-
public String getMjob() {
return mjob;
}
-
-
public void setMjob(String mjob) {
this.mjob = mjob;
}
-
-
public String getMphone() {
return mphone;
}
-
-
public void setMphone(String mphone) {
this.mphone = mphone;
}
-
-
public Date getMbirth() {
return mbirth;
}
-
-
public void setMbirth(Date mbirth) {
this.mbirth = mbirth;
}
-
-
public int getWeek() {
return week;
}
-
-
public void setWeek(int week) {
this.week = week;
}
-
-
public String getSickenInfo() {
return sickenInfo;
}
-
-
public void setSickenInfo(String sickenInfo) {
this.sickenInfo = sickenInfo;
}
-
-
public String getOrg() {
return org;
}
-
-
public void setOrg(String org) {
this.org = org;
}
-
-
public String getBirthSituation() {
return birthSituation;
}
-
-
public void setBirthSituation(String birthSituation) {
this.birthSituation = birthSituation;
}
-
-
public String getNeonatalAsphyxia() {
return neonatalAsphyxia;
}
-
-
public void setNeonatalAsphyxia(String neonatalAsphyxia) {
this.neonatalAsphyxia = neonatalAsphyxia;
}
-
-
public int getDeformity() {
return deformity;
}
-
-
public void setDeformity(int deformity) {
this.deformity = deformity;
}
-
-
public int getHearing() {
return hearing;
}
-
-
public void setHearing(int hearing) {
this.hearing = hearing;
}
-
-
public int getDisease() {
return disease;
}
-
-
public void setDisease(int disease) {
this.disease = disease;
}
-
-
public double getBirthWeight() {
return birthWeight;
}
-
-
public void setBirthWeight(double birthWeight) {
this.birthWeight = birthWeight;
}
-
-
public double getWeight() {
return weight;
}
-
-
public void setWeight(double weight) {
this.weight = weight;
}
-
-
public double getHeight() {
return height;
}
-
-
public void setHeight(double height) {
this.height = height;
}
-
-
public int getFeedType() {
return feedType;
}
-
-
public void setFeedType(int feedType) {
this.feedType = feedType;
}
-
-
public int getEatMilk() {
return eatMilk;
}
-
-
public void setEatMilk(int eatMilk) {
this.eatMilk = eatMilk;
}
-
-
public int getEatTime() {
return eatTime;
}
-
-
public void setEatTime(int eatTime) {
this.eatTime = eatTime;
}
-
-
public int getEmesis() {
return emesis;
}
-
-
public void setEmesis(int emesis) {
this.emesis = emesis;
}
-
-
public String getShit() {
return shit;
}
-
-
public void setShit(String shit) {
this.shit = shit;
}
-
-
public int getShitTimeOfDay() {
return shitTimeOfDay;
}
-
-
public void setShitTimeOfDay(int shitTimeOfDay) {
this.shitTimeOfDay = shitTimeOfDay;
}
-
-
public double getTemperature() {
return temperature;
}
-
-
public void setTemperature(double temperature) {
this.temperature = temperature;
}
-
-
public double getHeartRate() {
return heartRate;
}
-
-
public void setHeartRate(double heartRate) {
this.heartRate = heartRate;
}
-
-
public double getRespiratoryRate() {
return respiratoryRate;
}
-
-
public void setRespiratoryRate(double respiratoryRate) {
this.respiratoryRate = respiratoryRate;
}
-
-
public String getComplexion() {
return complexion;
}
-
-
public void setComplexion(String complexion) {
this.complexion = complexion;
}
-
-
public String getJaundiceParts() {
return JaundiceParts;
}
-
-
public void setJaundiceParts(String jaundiceParts) {
JaundiceParts = jaundiceParts;
}
-
-
public String getBregma() {
return bregma;
}
-
-
public void setBregma(String bregma) {
this.bregma = bregma;
}
-
-
public String getEye() {
return eye;
}
-
-
public void setEye(String eye) {
this.eye = eye;
}
-
-
public String getLimbsActivity() {
return LimbsActivity;
}
-
-
public void setLimbsActivity(String limbsActivity) {
LimbsActivity = limbsActivity;
}
-
-
public String getEarAppearance() {
return earAppearance;
}
-
-
public void setEarAppearance(String earAppearance) {
this.earAppearance = earAppearance;
}
-
-
public String getCervicalMass() {
return cervicalMass;
}
-
-
public void setCervicalMass(String cervicalMass) {
this.cervicalMass = cervicalMass;
}
-
-
public String getNose() {
return nose;
}
-
-
public void setNose(String nose) {
this.nose = nose;
}
-
-
public String getSkin() {
return skin;
}
-
-
public void setSkin(String skin) {
this.skin = skin;
}
-
-
public String getMouthCavity() {
return mouthCavity;
}
-
-
public void setMouthCavity(String mouthCavity) {
this.mouthCavity = mouthCavity;
}
-
-
public String getAnus() {
return anus;
}
-
-
public void setAnus(String anus) {
this.anus = anus;
}
-
-
public String getAuscultation() {
return auscultation;
}
-
-
public void setAuscultation(String auscultation) {
this.auscultation = auscultation;
}
-
-
public String getBreast() {
return breast;
}
-
-
public void setBreast(String breast) {
this.breast = breast;
}
-
-
public String getAbdominalPalpation() {
return abdominalPalpation;
}
-
-
public void setAbdominalPalpation(String abdominalPalpation) {
this.abdominalPalpation = abdominalPalpation;
}
-
-
public String getBackbone() {
return backbone;
}
-
-
public void setBackbone(String backbone) {
this.backbone = backbone;
}
-
-
public String getPudendum() {
return pudendum;
}
-
-
public void setPudendum(String pudendum) {
this.pudendum = pudendum;
}
-
-
public String getFunicle() {
return funicle;
}
-
-
public void setFunicle(String funicle) {
this.funicle = funicle;
}
-
-
public String getReferralAdvice() {
return referralAdvice;
}
-
-
public void setReferralAdvice(String referralAdvice) {
this.referralAdvice = referralAdvice;
}
-
-
public String getGuide() {
return guide;
}
-
-
public void setGuide(String guide) {
this.guide = guide;
}
-
-
public Date getCurrentVisit() {
return currentVisit;
}
-
-
public void setCurrentVisit(Date currentVisit) {
this.currentVisit = currentVisit;
}
-
-
public String getNextVisitAddr() {
return nextVisitAddr;
}
-
-
public void setNextVisitAddr(String nextVisitAddr) {
this.nextVisitAddr = nextVisitAddr;
}
-
-
public Date getNextVisitDate() {
return nextVisitDate;
}
-
-
public void setNextVisitDate(Date nextVisitDate) {
this.nextVisitDate = nextVisitDate;
}
-
-
public String getDoctorSign() {
return doctorSign;
}
-
-
public void setDoctorSign(String doctorSign) {
this.doctorSign = doctorSign;
}
-
-
- public BabyVisitModel convertToDataModel(){
- BabyVisitModel babyVisitModel = new BabyVisitModel();
+ public BabyVisitModel convertToDataModel() {
+ BabyVisitModel babyVisitModel = new BabyVisitModel();
babyVisitModel.setAbdominalPalpation(abdominalPalpation);
babyVisitModel.setAnus(anus);
babyVisitModel.setAuscultation(auscultation);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java
index 5161708..aeee853 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java
@@ -8,27 +8,35 @@ import com.lyms.platform.common.core.annotation.form.FormParam;
@Form
public class BasicConfigUpdateRequest {
private String id;
+
@FormParam
- @NotEmpty(message="name不能为空.")
+ @NotEmpty(message = "name不能为空.")
private String name;
+
@FormParam
- @NotEmpty(message="code不能为空.")
+ @NotEmpty(message = "code不能为空.")
private String code;
+
public String getId() {
return id;
}
+
public void setId(String id) {
this.id = id;
}
+
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
+
public String getCode() {
return code;
}
+
public void setCode(String code) {
this.code = code;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java
index 1fcd8de..2bcf392 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java
@@ -27,7 +27,7 @@ public class PuerperaManagerQueryRequest extends BasePageQueryRequest {
/**
* 社区名称
*/
- @FormParam
+ @FormParam("communityid")
private String communityId;
/**
@@ -39,16 +39,15 @@ public class PuerperaManagerQueryRequest extends BasePageQueryRequest {
/**
* 分娩日期开始
*/
- @FormParam
+ @FormParam("duedatestart")
private Date dueDateStart;
/**
* 分娩日期结束
*/
- @FormParam
+ @FormParam("duedateend")
private Date dueDateEnd;
-
public String getCommunityId() {
return communityId;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerUpdateRequest.java
index 86ff2f7..a18c6d6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerUpdateRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerUpdateRequest.java
@@ -3,9 +3,11 @@ package com.lyms.platform.operate.web.request;
import java.util.Map;
import com.lyms.platform.common.base.IBasicRequestConvert;
+import com.lyms.platform.common.core.annotation.form.FormParam;
import com.lyms.platform.common.utils.DateUtil;
import com.lyms.platform.common.utils.JsonUtil;
import com.lyms.platform.pojo.PuerperaModel;
+import com.lyms.platform.pojo.VisitModel;
/**
* 产妇管理修改接口
@@ -13,7 +15,7 @@ import com.lyms.platform.pojo.PuerperaModel;
* @author Administrator
*/
@SuppressWarnings("rawtypes")
-public class PuerperaManagerUpdateRequest implements IBasicRequestConvert {
+public class PuerperaManagerUpdateRequest implements IBasicRequestConvert {
// 产妇信息字段 start
/**
@@ -25,15 +27,19 @@ public class PuerperaManagerUpdateRequest implements IBasicRequestConvert
+ * 详细描述
+ *
+ * 示例代码
+ *
+ *
+ *
+ *
+ * @author In_Home
+ * @version BME V100R001 2016-3-21
+ * @since BME V100R001C40B104
+ */
+@Form
+public class PuerperaVisitQueryRequest {
+
+ @FormParam("cardno")
+ private String cardNo;
+
+ private String id;
+
+ public String getCardNo() {
+ return cardNo;
+ }
+
+ public void setCardNo(String cardNo) {
+ this.cardNo = cardNo;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
index 36d9c86..a735132 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
@@ -3,6 +3,8 @@ package com.lyms.platform.operate.web.request;
import java.util.Date;
import java.util.Map;
+import com.lyms.platform.common.core.annotation.form.FormParam;
+import com.lyms.platform.common.utils.DateUtil;
import com.lyms.platform.common.utils.JsonUtil;
import com.lyms.platform.pojo.PuerperaModel;
import com.lyms.platform.pojo.VisitModel;
@@ -34,21 +36,25 @@ public class VisitAddRequest {
/**
* 产妇身份证号码
*/
+ @FormParam("cardno")
private String cardNo;
/**
* 分娩日期
*/
+ @FormParam("duedate")
private String dueDate;
/**
* 分娩类型
*/
+ @FormParam("duetype")
private String dueType;
/**
* 助产机构
*/
+ @FormParam("deliverorg")
private String deliverOrg;
/**
@@ -75,6 +81,7 @@ public class VisitAddRequest {
/**
* 心法接生
*/
+ @FormParam("xintype")
private int xinType;
/**
@@ -371,29 +378,29 @@ public class VisitAddRequest {
this.wound = wound;
}
- public PuerperaModel getPuerpera() {
- PuerperaModel puerperaModel = new PuerperaModel();
-
+ public SimpleVisitPuerpera getPuerpera() {
+ SimpleVisitPuerpera puerperaModel = new SimpleVisitPuerpera();
+
puerperaModel.setId(parentId);
puerperaModel.setName(name);
puerperaModel.setAge(age);
- puerperaModel.setCardNo(cardNo);
- puerperaModel.setDueDate(new Date());
+ puerperaModel.setCardno(cardNo);
+ puerperaModel.setDueDate(dueDate);
puerperaModel.setDeliverOrg(deliverOrg);
puerperaModel.setDueType(dueType);
puerperaModel.setAddress(JsonUtil.obj2JsonString(address));
return puerperaModel;
}
-
- public VisitModel getRequestVisit(){
- VisitModel visit = new VisitModel();
+
+ public VisitModel getRequestVisit() {
+ VisitModel visit = new VisitModel();
try {
visit.setBp(JsonUtil.obj2JsonString(bp));
visit.setGuide(JsonUtil.obj2JsonString(guide));
visit.setReferral(JsonUtil.obj2JsonString(referral));
} catch (Exception e) {
}
-
+
visit.setBreast(breast);
visit.setChecktime(checktime);
visit.setDays(days);
@@ -412,4 +419,196 @@ public class VisitAddRequest {
visit.setParentId(parentId);
return visit;
}
+
+ /**
+ * 访视记录产妇信息
+ *
+ * 详细描述
+ *
+ * 示例代码
+ *
+ *
+ *
+ *
+ * @author In_Home
+ * @version BME V100R001 2016-3-21
+ * @since BME V100R001C40B104
+ */
+ public class SimpleVisitPuerpera {
+ private String id;
+
+ private String name;
+
+ private int age;
+
+ private String cardno;
+
+ private String dueDate;
+
+ private String deliverOrg;
+
+ private String dueType;
+
+ private String address;
+
+ public SimpleVisitPuerpera() {
+ }
+
+ public SimpleVisitPuerpera(PuerperaModel model) {
+ id = model.getId();
+ name = model.getName();
+ age = model.getAge();
+ cardno = model.getCardNo();
+ dueDate = DateUtil.getyyyy_MM_dd(model.getDueDate());
+ deliverOrg = model.getDeliverOrg();
+ dueType = model.getDueType();
+ address = model.getAddress();
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setAge(int age) {
+ this.age = age;
+ }
+
+ public String getCardno() {
+ return cardno;
+ }
+
+ public void setCardno(String cardno) {
+ this.cardno = cardno;
+ }
+
+ public String getDueDate() {
+ return dueDate;
+ }
+
+ public void setDueDate(String dueDate) {
+ this.dueDate = dueDate;
+ }
+
+ public String getDeliverOrg() {
+ return deliverOrg;
+ }
+
+ public void setDeliverOrg(String deliverOrg) {
+ this.deliverOrg = deliverOrg;
+ }
+
+ public String getDueType() {
+ return dueType;
+ }
+
+ public void setDueType(String dueType) {
+ this.dueType = dueType;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public PuerperaModel build() {
+ PuerperaModel puerperaModel = new PuerperaModel();
+ puerperaModel.setId(parentId);
+ puerperaModel.setName(name);
+ puerperaModel.setAge(age);
+ puerperaModel.setCardNo(cardNo);
+ puerperaModel.setDueDate(new Date());
+ puerperaModel.setDeliverOrg(deliverOrg);
+ puerperaModel.setDueType(dueType);
+ puerperaModel.setAddress(JsonUtil.obj2JsonString(address));
+ return puerperaModel;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((address == null) ? 0 : address.hashCode());
+ result = prime * result + age;
+ result = prime * result + ((cardno == null) ? 0 : cardno.hashCode());
+ result = prime * result + ((deliverOrg == null) ? 0 : deliverOrg.hashCode());
+ result = prime * result + ((dueDate == null) ? 0 : dueDate.hashCode());
+ result = prime * result + ((dueType == null) ? 0 : dueType.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+ if (getClass() != obj.getClass()) return false;
+ SimpleVisitPuerpera other = (SimpleVisitPuerpera) obj;
+ if (address == null) {
+ if (other.address != null) return false;
+ } else if (!address.equals(other.address)) return false;
+ if (age != other.age) return false;
+ if (cardno == null) {
+ if (other.cardno != null) return false;
+ } else if (!cardno.equals(other.cardno)) return false;
+ if (deliverOrg == null) {
+ if (other.deliverOrg != null) return false;
+ } else if (!deliverOrg.equals(other.deliverOrg)) return false;
+ if (dueDate == null) {
+ if (other.dueDate != null) return false;
+ } else if (!dueDate.equals(other.dueDate)) return false;
+ if (dueType == null) {
+ if (other.dueType != null) return false;
+ } else if (!dueType.equals(other.dueType)) return false;
+ if (id == null) {
+ if (other.id != null) return false;
+ } else if (!id.equals(other.id)) return false;
+ if (name == null) {
+ if (other.name != null) return false;
+ } else if (!name.equals(other.name)) return false;
+ return true;
+ }
+ }
+
+ public static void main(String[] args) {
+ SimpleVisitPuerpera puerpera = new VisitAddRequest().new SimpleVisitPuerpera();
+ puerpera.setAddress("天府2街");
+ puerpera.setAge(1);
+ puerpera.setCardno("500311932121545");
+ puerpera.setDeliverOrg("西财华西");
+ puerpera.setDueDate("2015-05-06");
+ puerpera.setDueType("剖腹");
+ puerpera.setId("11");
+ puerpera.setName("查房");
+
+ PuerperaModel model = new PuerperaModel();
+ model.setAddress("天府2街");
+ model.setAge(1);
+ model.setCardNo("500311932121545");
+ model.setDeliverOrg("西财华西");
+ model.setDueDate(DateUtil.parseYMD("2015-05-07"));
+ model.setDueType("剖腹");
+ model.setId("11");
+ model.setName("查房1");
+ System.out.println(puerpera.equals(new VisitAddRequest().new SimpleVisitPuerpera(model)));
+ }
}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
index ea6fb22..8bf28e5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
@@ -1,6 +1,5 @@
package com.lyms.platform.operate.web.result;
-import java.util.Date;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -11,85 +10,80 @@ import com.lyms.platform.pojo.BabyVisitModel;
import com.lyms.platform.pojo.PuerperaModel;
/**
- *
* 小孩访视记录的返回对象
*
* @author Administrator
- *
*/
-public class BabyVisitResult implements IBasicResultConvert{
-
- //母亲的姓名
+public class BabyVisitResult implements IBasicResultConvert {
+
+ // 母亲的姓名
private String mName;
- //母亲的身份证号码
+
+ // 母亲的身份证号码
private String mCardNo;
- //年龄
+
+ // 年龄
private int age;
-
- //具体的访视记录
+
+ // 产妇的id
+ private String parentId;
+
+ // 具体的访视记录
private List data;
-
- public String getmName() {
- return mName;
+
+ public String getParentId() {
+ return parentId;
}
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+ public String getmName() {
+ return mName;
+ }
public void setmName(String mName) {
this.mName = mName;
}
-
-
public String getmCardNo() {
return mCardNo;
}
-
-
public void setmCardNo(String mCardNo) {
this.mCardNo = mCardNo;
}
-
-
public int getAge() {
return age;
}
-
-
public void setAge(int age) {
this.age = age;
}
-
-
public List getData() {
return data;
}
-
-
public void setData(List data) {
this.data = data;
}
-
-
/**
- *
* 小孩的访视记录
*
* @author Administrator
- *
*/
- public class BabyVisit implements IBasicResultConvert{
-
+ public class BabyVisit implements IBasicResultConvert {
+
@Id
private String id;
+
// 名称
private String name;
+
// 编号
private String sNumber;
@@ -115,7 +109,7 @@ public class BabyVisitResult implements IBasicResultConvert data;
+ private List data;
public String getName() {
return name;
}
-
public void setName(String name) {
this.name = name;
}
-
public int getAge() {
return age;
}
-
public void setAge(int age) {
this.age = age;
}
-
public String getCardNo() {
return cardNo;
}
-
public void setCardNo(String cardNo) {
this.cardNo = cardNo;
}
-
public String getDueDate() {
return dueDate;
}
-
public void setDueDate(String dueDate) {
this.dueDate = dueDate;
}
-
public String getDueType() {
return dueType;
}
-
public void setDueType(String dueType) {
this.dueType = dueType;
}
-
public String getDeliverOrg() {
return deliverOrg;
}
-
public void setDeliverOrg(String deliverOrg) {
this.deliverOrg = deliverOrg;
}
-
public Map getAddress() {
return address;
}
-
public void setAddress(Map address) {
this.address = address;
}
-
public List getData() {
return data;
}
-
public void setData(List data) {
this.data = data;
}
-
- public void convertToResult(PuerperaModel model){
+
+ public void convertToResult(PuerperaModel model) {
try {
setAddress(JsonUtil.str2Obj(model.getAddress(), Map.class));
} catch (Exception e) {
@@ -110,5 +99,6 @@ public class VisitResult {
setDeliverOrg(model.getDeliverOrg());
setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
setDueType(model.getDueType());
+ setName(model.getName());
}
}
\ No newline at end of file