diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java index 9ef3807..fea524d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java @@ -15,14 +15,14 @@ import com.lyms.platform.common.dao.operator.Page; import com.lyms.platform.pojo.PuerperaModel; import com.lyms.platform.query.PuerperaModelQuery; - @Service public class PuerperaService { @Autowired private IPuerperaDao iPuerperaDao; - - public void addPuerpera(PuerperaModel obj) { - iPuerperaDao.addPuerpera(obj); + + public PuerperaModel addPuerpera(PuerperaModel obj) { + + return iPuerperaDao.addPuerpera(obj); } public void updatePuerpera(PuerperaModel obj) { @@ -38,23 +38,21 @@ public class PuerperaService { return iPuerperaDao.queryPuerpera(query.addOrder(Direction.ASC, "id")); } - + /** * 根据身份证号码查询某一个患者 * * @return */ - public PuerperaModel findOnePuerperaByCardNo(PuerperaModelQuery puerperaQuery){ - - - + public PuerperaModel findOnePuerperaByCardNo(PuerperaModelQuery puerperaQuery) { + return iPuerperaDao.queryPuerpera(puerperaQuery.convertToQuery()).get(0); } - public PuerperaModel findOnePuerperaById(String id){ + public PuerperaModel findOnePuerperaById(String id) { return iPuerperaDao.getPuerpera(id); } - + public List queryByParentId(String parentId) { return iPuerperaDao.queryPuerpera(MongoCondition.newInstance("parentId", parentId, MongoOper.IS).toMongoQuery()); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java index 4ed6bf2..debdf00 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java @@ -2,10 +2,16 @@ package com.lyms.platform.pojo; import com.lyms.platform.common.result.BaseModel; -public class AssayConfig extends BaseModel{ +public class AssayConfig extends BaseModel { + /** + * 添加字段注释 + */ + private static final long serialVersionUID = 1L; + private String id; private String yn; + private String print; public String getPrint() { 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 fa8b786..7b3f655 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 @@ -116,7 +116,7 @@ public class BabyVisitModel extends BaseModel { private String shit; // 大便次数 - private int shitTimeOfDay; + private int shitTimes; // 体温 private double temperature; @@ -420,12 +420,12 @@ public class BabyVisitModel extends BaseModel { this.shit = shit; } - public int getShitTimeOfDay() { - return shitTimeOfDay; + public int getShitTimes() { + return shitTimes; } - public void setShitTimeOfDay(int shitTimeOfDay) { - this.shitTimeOfDay = shitTimeOfDay; + public void setShitTimes(int shitTimes) { + this.shitTimes = shitTimes; } public double getTemperature() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Permissions.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Permissions.java new file mode 100644 index 0000000..1f2343e --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Permissions.java @@ -0,0 +1,167 @@ +package com.lyms.platform.pojo; + +import java.util.Date; + +public class Permissions { + private String id; + + private Integer type; + + private String moduleName; + + private String functionName; + + private String moduleCode; + + private String functionCode; + + private String permissionName; + + private String action; + + private String ext; + + private String url; + + private String publishId; + + private String publishName; + + private Integer yn; + + private Date modified; + + private Date created; + + public String getModuleCode() { + return moduleCode; + } + + public void setModuleCode(String moduleCode) { + this.moduleCode = moduleCode; + } + + public String getFunctionCode() { + return functionCode; + } + + public void setFunctionCode(String functionCode) { + this.functionCode = functionCode; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + + } + + public String getModuleName() { + return moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + + } + + public String getFunctionName() { + return functionName; + } + + public void setFunctionName(String functionName) { + this.functionName = functionName; + + } + + public String getPermissionName() { + return permissionName; + } + + public void setPermissionName(String permissionName) { + this.permissionName = permissionName; + + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + + } + + public String getExt() { + return ext; + } + + public void setExt(String ext) { + this.ext = ext; + + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + + } + + public String getPublishId() { + return publishId; + } + + public void setPublishId(String publishId) { + this.publishId = publishId; + + } + + public String getPublishName() { + return publishName; + } + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java index 56e2860..0e133d6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java @@ -1,12 +1,13 @@ package com.lyms.platform.pojo; -import com.lyms.platform.common.core.annotation.form.Form; -import com.lyms.platform.common.result.BaseModel; +import javax.validation.constraints.NotNull; + import org.hibernate.validator.constraints.NotEmpty; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; -import javax.validation.constraints.NotNull; +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.result.BaseModel; /** * Created by Zhang.Rui on 2016/3/17. @@ -15,6 +16,10 @@ import javax.validation.constraints.NotNull; @Form @Document public class ReferValue extends BaseModel{ + /** + * TODO 添加字段注释 + */ + private static final long serialVersionUID = 1L; @Id private String id; @NotNull(message = "医院ID不能为空") diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/RolePermissionMaps.java b/platform-dal/src/main/java/com/lyms/platform/pojo/RolePermissionMaps.java new file mode 100644 index 0000000..1a79ef7 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/RolePermissionMaps.java @@ -0,0 +1,35 @@ +package com.lyms.platform.pojo; + +public class RolePermissionMaps { + private String roleId; + + private String permissionId; + + private Integer yn; + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + + } + + public String getPermissionId() { + return permissionId; + } + + public void setPermissionId(String permissionId) { + this.permissionId = permissionId; + + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Roles.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Roles.java new file mode 100644 index 0000000..966bd37 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Roles.java @@ -0,0 +1,104 @@ +package com.lyms.platform.pojo; + +import java.util.Date; + +public class Roles { + private String id; + + private Integer type; + + private String parentId; + + private String title; + + private String publishId; + + private String publishName; + + private Integer yn; + + private Date modified; + + private Date created; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + + } + + public String getPublishId() { + return publishId; + } + + public void setPublishId(String publishId) { + this.publishId = publishId; + + } + + public String getPublishName() { + return publishName; + } + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/UserRoleMaps.java b/platform-dal/src/main/java/com/lyms/platform/pojo/UserRoleMaps.java new file mode 100644 index 0000000..de29a2b --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/UserRoleMaps.java @@ -0,0 +1,34 @@ +package com.lyms.platform.pojo; + +public class UserRoleMaps { + private String userId; + + private String roleId; + + private Integer yn; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Users.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Users.java new file mode 100644 index 0000000..7aed4f5 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Users.java @@ -0,0 +1,158 @@ +package com.lyms.platform.pojo; + +import java.util.Date; + +public class Users { + private String id; + + private Integer type; + + private String parentId; + + private Integer deptId; + + private String username; + + private String account; + + private String pwd;// + + private String phone; + + private String publishId; + + private String publishName; + + private Integer yn; + + private Date modified; + + private Date created; + + private Date lastLoginTime; + + public Date getLastLoginTime() { + return lastLoginTime; + } + + public void setLastLoginTime(Date lastLoginTime) { + this.lastLoginTime = lastLoginTime; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + + } + + public Integer getDeptId() { + return deptId; + } + + public void setDeptId(Integer deptId) { + this.deptId = deptId; + + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + + } + + public String getPwd() { + return pwd; + } + + public void setPwd(String pwd) { + this.pwd = pwd; + + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + + } + + public String getPublishId() { + return publishId; + } + + public void setPublishId(String publishId) { + this.publishId = publishId; + + } + + public String getPublishName() { + return publishName; + } + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + + } +} \ No newline at end of file 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 403f5f8..f2ca0bf 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 @@ -49,7 +49,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { */ private int visitstatus = -1; - private int yn; + private int yn= -1; public int getYn() { return yn; @@ -126,13 +126,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != id) { condition = condition.and("id", id, MongoOper.IS); } + if(-1!=yn){ + condition = condition.and("yn", yn, 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); + condition = condition.and("parentid", parentId, MongoOper.IS); } Criteria c = null; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PermissionsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PermissionsQuery.java new file mode 100644 index 0000000..9a6db93 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/PermissionsQuery.java @@ -0,0 +1,170 @@ +package com.lyms.platform.query; + +import java.util.Date; + +import com.lyms.platform.common.dao.BaseQuery; + +public class PermissionsQuery extends BaseQuery { + private Integer id; + + private Integer type; + + private String moduleName; + + private String functionName; + + private String permissionName; + + private String action; + + private String ext; + + private String url; + + private Integer publishId; + + private String publishName; + + private Integer yn; + + private Date modified; + + private Date created; + + private String moduleCode; + + private String functionCode; + + public String getModuleCode() { + return moduleCode; + } + + public void setModuleCode(String moduleCode) { + this.moduleCode = moduleCode; + } + + public String getFunctionCode() { + return functionCode; + } + + public void setFunctionCode(String functionCode) { + this.functionCode = functionCode; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + + } + + public String getModuleName() { + return moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + + } + + public String getFunctionName() { + return functionName; + } + + public void setFunctionName(String functionName) { + this.functionName = functionName; + + } + + public String getPermissionName() { + return permissionName; + } + + public void setPermissionName(String permissionName) { + this.permissionName = permissionName; + + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + + } + + public String getExt() { + return ext; + } + + public void setExt(String ext) { + this.ext = ext; + + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + + } + + public Integer getPublishId() { + return publishId; + } + + public void setPublishId(Integer publishId) { + this.publishId = publishId; + + } + + public String getPublishName() { + return publishName; + } + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/RolePermissionMapsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/RolePermissionMapsQuery.java new file mode 100644 index 0000000..05562a8 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/RolePermissionMapsQuery.java @@ -0,0 +1,38 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.dao.BaseQuery; + +public class RolePermissionMapsQuery extends BaseQuery { + private String roleId; + + private String permissionId; + + private Integer yn; + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + + } + + public String getPermissionId() { + return permissionId; + } + + public void setPermissionId(String permissionId) { + this.permissionId = permissionId; + + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/RolesQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/RolesQuery.java new file mode 100644 index 0000000..3a2b25a --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/RolesQuery.java @@ -0,0 +1,104 @@ +package com.lyms.platform.query; + +import java.util.Date; + +import com.lyms.platform.common.dao.BaseQuery; + +public class RolesQuery extends BaseQuery { + + private String id; + + private Integer type; + + private String parentId; + + private String title; + + private String publishId; + + private String publishName; + + private Integer yn; + + private Date modified; + + private Date created; + + 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 getPublishId() { + return publishId; + } + + public void setPublishId(String publishId) { + this.publishId = publishId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + + } + + public String getPublishName() { + return publishName; + } + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/UserRoleMapsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/UserRoleMapsQuery.java new file mode 100644 index 0000000..3dedb97 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/UserRoleMapsQuery.java @@ -0,0 +1,38 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.dao.BaseQuery; + +public class UserRoleMapsQuery extends BaseQuery { + private String userId; + + private String roleId; + + private Integer yn; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/UsersQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/UsersQuery.java new file mode 100644 index 0000000..a8c9c03 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/UsersQuery.java @@ -0,0 +1,149 @@ +package com.lyms.platform.query; + +import java.util.Date; + +import com.lyms.platform.common.dao.BaseQuery; + +public class UsersQuery extends BaseQuery { + private String id; + + private Integer type; + + private Integer parentId; + + private Integer deptId; + + private String username; + + private String account; + + private String pwd; + + private String phone; + + private Integer publishId; + + private String publishName; + + private Integer yn; + + private Date modified; + + private Date created; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + + } + + public Integer getParentId() { + return parentId; + } + + public void setParentId(Integer parentId) { + this.parentId = parentId; + + } + + public Integer getDeptId() { + return deptId; + } + + public void setDeptId(Integer deptId) { + this.deptId = deptId; + + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + + } + + public String getPwd() { + return pwd; + } + + public void setPwd(String pwd) { + this.pwd = pwd; + + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + + } + + public Integer getPublishId() { + return publishId; + } + + public void setPublishId(Integer publishId) { + this.publishId = publishId; + + } + + public String getPublishName() { + return publishName; + } + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + + } +} \ 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 9a83c8b..a48392e 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 @@ -75,7 +75,7 @@ public class VisitController extends RestController { @RequestMapping(value = "/visitbaby", method = RequestMethod.POST) public BaseResponse addOneBabyVisit(@Valid BabyVisitAddRequest babyVisitAddRequest) { - return visitFacade.addOneBabyVisit(babyVisitAddRequest); + return visitFacade.addOrUpdateBabyAndVisit(babyVisitAddRequest); } /** 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 807c0b5..8c83f69 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 @@ -27,6 +27,7 @@ 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.BabyModelQuery; import com.lyms.platform.query.PuerperaModelQuery; import com.lyms.platform.query.VisitQuery; @@ -135,18 +136,23 @@ public class VisitFacade { 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("产妇信息不存在"); } + } else { + // 表示是新的产妇直接新增 + parentId = puerperaService.addPuerpera(visitRequest.getPuerpera().build()).getId(); + } + // 如果为空表示新增 + if (StringUtils.isEmpty(visitRequest.getRequestVisit().getId())) { + if (StringUtils.isNotEmpty(parentId)) { + visitRequest.getRequestVisit().setParentId(parentId); + } + visitService.addVisit(visitRequest.getRequestVisit()); + } else { + visitService.updateVisit(visitRequest.getRequestVisit()); } - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("产妇id不能为空"); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } /** @@ -189,16 +195,23 @@ public class VisitFacade { } private BaseObjectResponse findBabyVisit(PuerperaModel puerperaModel) { - // 根据产妇id查询该产妇下的小孩访视 - List babyVisits = babyVisitService.findAllVisitByParentId(puerperaModel.getId()); - - // 数据转换 + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setParentId(puerperaModel.getId()); + babyQuery.setYn(YnEnums.YES.getId()); + List babies= babyService.queryBabyWithQuery(babyQuery); BabyVisitResult babyVisitResult = new BabyVisitResult(); List data = new ArrayList(); - for (BabyVisitModel visit : babyVisits) { - BabyVisit babyVisit = babyVisitResult.new BabyVisit(); - // 转换小孩的访视数据 - data.add(babyVisit.convertToResult(visit)); + for(BabyModel bModel:babies){ + // 根据产妇id查询该产妇下的小孩访视 + List babyVisits = babyVisitService.findAllVisitByParentId(bModel.getId()); + + // 数据转换 + + for (BabyVisitModel visit : babyVisits) { + BabyVisit babyVisit = babyVisitResult.new BabyVisit(); + // 转换小孩的访视数据 + data.add(babyVisit.convertToResult(visit)); + } } // TODO 需要转换成具体的result对象 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 f92917f..63b0b04 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 @@ -1,9 +1,8 @@ package com.lyms.platform.operate.web.request; -import java.util.Date; - import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.BabyVisitModel; @Form @@ -23,7 +22,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private int sex; // 生日 - private Date birth; + private String birth; // 父亲信息 private String fname; @@ -41,7 +40,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private String mphone; - private Date mbirth; + private String mbirth; private int week; @@ -91,7 +90,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private String shit; // 大便次数 - private int shitTimeOfDay; + private int shitTimes; // 体温 private double temperature; @@ -106,7 +105,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private String complexion; // 黄疸部位 - private String JaundiceParts; + private String jaundiceParts; // 前卤 private String bregma; @@ -115,7 +114,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private String eye; // 四肢活动度 - private String LimbsActivity; + private String limbsActivity; // 耳外观 private String earAppearance; @@ -160,13 +159,13 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private String guide; // 本次访视时间 - private Date currentVisit; + private String currentVisit; // 下次随访地点 private String nextVisitAddr; // 下次访视时间 - private Date nextVisitDate; + private String nextVisitDate; // 随访医生签名 private String doctorSign; @@ -214,11 +213,11 @@ public class BabyVisitAddRequest implements IBasicRequestConvert this.sex = sex; } - public Date getBirth() { + public String getBirth() { return birth; } - public void setBirth(Date birth) { + public void setBirth(String birth) { this.birth = birth; } @@ -278,11 +277,11 @@ public class BabyVisitAddRequest implements IBasicRequestConvert this.mphone = mphone; } - public Date getMbirth() { + public String getMbirth() { return mbirth; } - public void setMbirth(Date mbirth) { + public void setMbirth(String mbirth) { this.mbirth = mbirth; } @@ -414,12 +413,12 @@ public class BabyVisitAddRequest implements IBasicRequestConvert this.shit = shit; } - public int getShitTimeOfDay() { - return shitTimeOfDay; + public int getShitTimes() { + return shitTimes; } - public void setShitTimeOfDay(int shitTimeOfDay) { - this.shitTimeOfDay = shitTimeOfDay; + public void setShitTimes(int shitTimes) { + this.shitTimes = shitTimes; } public double getTemperature() { @@ -455,11 +454,11 @@ public class BabyVisitAddRequest implements IBasicRequestConvert } public String getJaundiceParts() { - return JaundiceParts; + return jaundiceParts; } public void setJaundiceParts(String jaundiceParts) { - JaundiceParts = jaundiceParts; + this.jaundiceParts = jaundiceParts; } public String getBregma() { @@ -479,11 +478,11 @@ public class BabyVisitAddRequest implements IBasicRequestConvert } public String getLimbsActivity() { - return LimbsActivity; + return limbsActivity; } public void setLimbsActivity(String limbsActivity) { - LimbsActivity = limbsActivity; + this.limbsActivity = limbsActivity; } public String getEarAppearance() { @@ -598,14 +597,6 @@ public class BabyVisitAddRequest implements IBasicRequestConvert this.guide = guide; } - public Date getCurrentVisit() { - return currentVisit; - } - - public void setCurrentVisit(Date currentVisit) { - this.currentVisit = currentVisit; - } - public String getNextVisitAddr() { return nextVisitAddr; } @@ -614,11 +605,19 @@ public class BabyVisitAddRequest implements IBasicRequestConvert this.nextVisitAddr = nextVisitAddr; } - public Date getNextVisitDate() { + public String getCurrentVisit() { + return currentVisit; + } + + public void setCurrentVisit(String currentVisit) { + this.currentVisit = currentVisit; + } + + public String getNextVisitDate() { return nextVisitDate; } - public void setNextVisitDate(Date nextVisitDate) { + public void setNextVisitDate(String nextVisitDate) { this.nextVisitDate = nextVisitDate; } @@ -632,13 +631,70 @@ public class BabyVisitAddRequest implements IBasicRequestConvert public BabyVisitModel convertToDataModel() { BabyVisitModel babyVisitModel = new BabyVisitModel(); + babyVisitModel.setName(name); + babyVisitModel.setSex(sex); + babyVisitModel.setBirth(DateUtil.parseYMD(birth)); + babyVisitModel.setMbirth(DateUtil.parseYMD(mbirth)); + babyVisitModel.setMjob(mjob); + babyVisitModel.setMname(mname); + babyVisitModel.setMphone(mphone); + babyVisitModel.setFbirth(DateUtil.parseYMD(fbirth)); + babyVisitModel.setFjob(fjob); + babyVisitModel.setFname(fname); + babyVisitModel.setFphone(fphone); babyVisitModel.setAbdominalPalpation(abdominalPalpation); babyVisitModel.setAnus(anus); babyVisitModel.setAuscultation(auscultation); babyVisitModel.setBackbone(backbone); - babyVisitModel.setBirth(birth); + babyVisitModel.setBirth(DateUtil.parseYMD(birth)); + babyVisitModel.setBirthSituation(birthSituation); + babyVisitModel.setBirthWeight(birthWeight); + babyVisitModel.setNextVisitAddr(nextVisitAddr); + babyVisitModel.setWeek(week); + babyVisitModel.setSickenInfo(sickenInfo); + babyVisitModel.setOrg(org); babyVisitModel.setBirthSituation(birthSituation); + babyVisitModel.setNeonatalAsphyxia(neonatalAsphyxia); + babyVisitModel.setDeformity(deformity); + babyVisitModel.setHearing(hearing); + babyVisitModel.setDisease(disease); babyVisitModel.setBirthWeight(birthWeight); + babyVisitModel.setWeight(weight); + babyVisitModel.setHeight(height); + babyVisitModel.setFeedType(feedType); + babyVisitModel.setEatMilk(eatMilk); + babyVisitModel.setEatTime(eatTime); + babyVisitModel.setEmesis(emesis); + babyVisitModel.setShit(shit); + babyVisitModel.setShitTimes(shitTimes); + babyVisitModel.setTemperature(temperature); + babyVisitModel.setHeartRate(heartRate); + babyVisitModel.setRespiratoryRate(respiratoryRate); + babyVisitModel.setComplexion(complexion); + babyVisitModel.setJaundiceParts(jaundiceParts); + babyVisitModel.setBregma(bregma); + babyVisitModel.setEye(eye); + babyVisitModel.setLimbsActivity(limbsActivity); + babyVisitModel.setEarAppearance(earAppearance); + babyVisitModel.setCervicalMass(cervicalMass); + babyVisitModel.setNose(nose); + babyVisitModel.setSkin(skin); + babyVisitModel.setMouthCavity(mouthCavity); + babyVisitModel.setAnus(anus); + babyVisitModel.setAuscultation(auscultation); + babyVisitModel.setBreast(breast); + babyVisitModel.setAbdominalPalpation(abdominalPalpation); + babyVisitModel.setBackbone(backbone); + babyVisitModel.setPudendum(pudendum); + babyVisitModel.setFunicle(funicle); + babyVisitModel.setReferralAdvice(referralAdvice); + babyVisitModel.setGuide(guide); + babyVisitModel.setCurrentVisit(DateUtil.parseYMD(currentVisit)); + babyVisitModel.setNextVisitAddr(nextVisitAddr); + babyVisitModel.setNextVisitDate(DateUtil.parseYMD(nextVisitDate)); + babyVisitModel.setDoctorSign(doctorSign); + babyVisitModel.setParentId(parentId); + babyVisitModel.setId(id); return babyVisitModel; } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasePageQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasePageQueryRequest.java index 3aba66a..2a4fdb7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasePageQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasePageQueryRequest.java @@ -8,37 +8,40 @@ import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.result.BaseModel; /** - * * 分页查询的基础请求 * * @author Administrator - * */ public class BasePageQueryRequest extends BaseModel { - + /** * */ private static final long serialVersionUID = 1L; - - @Min(value=1,message="page.min") + + @Min(value = 1, message = "page.min") @FormParam - @NotNull(message="page.must.not.null") + @NotNull(message = "page.not.null") protected Integer page; - @NotNull(message="page.limit.must.not.null") - @Min(value=1,message="page.min") - @Max(value=40,message="page.max") + + @NotNull(message = "page.limit.not.null") + @Min(value = 1, message = "page.min") + @Max(value = 40, message = "page.max") @FormParam protected Integer limit; + public Integer getPage() { return page; } + public void setPage(Integer page) { this.page = page; } + public Integer getLimit() { return limit; } + public void setLimit(Integer limit) { this.limit = limit; } 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 a735132..ca50ef2 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 @@ -1,8 +1,14 @@ package com.lyms.platform.operate.web.request; import java.util.Date; -import java.util.Map; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +import org.hibernate.validator.constraints.NotEmpty; + +import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; @@ -14,7 +20,7 @@ import com.lyms.platform.pojo.VisitModel; * * @author Administrator */ -@SuppressWarnings("rawtypes") +@Form public class VisitAddRequest { // 产妇基本信息 start @@ -26,17 +32,22 @@ public class VisitAddRequest { /** * 产妇名称 */ + @NotEmpty(message = "产妇名称不能为空") private String name; /** * 产妇年龄 */ + @NotNull(message = "page.limit.must.not.null") + @Min(value = 1, message = "page.min") + @Max(value = 40, message = "page.max") private int age; /** * 产妇身份证号码 */ @FormParam("cardno") + @NotEmpty(message = "产妇名称不能为空") private String cardNo; /** @@ -60,7 +71,7 @@ public class VisitAddRequest { /** * 地址 */ - private Map address; + private String address; // 产妇基本信息 end /** @@ -138,19 +149,19 @@ public class VisitAddRequest { /** * 指导 */ - private Map guide; + private String guide; /** * 血压 */ // private Bp bp; - private Map bp; + private String bp; /** * 转诊 */ // private Referral referral; - private Map referral; + private String referral; /** * 类型 @@ -210,11 +221,11 @@ public class VisitAddRequest { this.deliverOrg = deliverOrg; } - public Map getAddress() { + public String getAddress() { return address; } - public void setAddress(Map address) { + public void setAddress(String address) { this.address = address; } @@ -338,27 +349,27 @@ public class VisitAddRequest { this.other = other; } - public Map getGuide() { + public String getGuide() { return guide; } - public void setGuide(Map guide) { + public void setGuide(String guide) { this.guide = guide; } - public Map getBp() { + public String getBp() { return bp; } - public void setBp(Map bp) { + public void setBp(String bp) { this.bp = bp; } - public Map getReferral() { + public String getReferral() { return referral; } - public void setReferral(Map referral) { + public void setReferral(String referral) { this.referral = referral; } @@ -403,7 +414,7 @@ public class VisitAddRequest { visit.setBreast(breast); visit.setChecktime(checktime); - visit.setDays(days); + visit.setDays(DateUtil.getDays(DateUtil.parseYMD(dueDate), DateUtil.parseYMD(checktime)) + ""); visit.setDoctorsign(doctorsign); visit.setDue(due); visit.setHealth(health); 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 8bf28e5..c58860c 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 @@ -689,15 +689,67 @@ public class BabyVisitResult implements IBasicResultConvert