diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java index f78c0e9..2c7a646 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java @@ -104,13 +104,20 @@ public class ResidentsArchiveController extends BaseController { return residentsArchiveFacade.queryResidentsArchives(residentsArchiveQueryRequest,loginState.getId(),"true"); } - //返回证件类型 + //返回证件类型Blood type @RequestMapping(value = "/getCertificateType", method = RequestMethod.GET) @ResponseBody public BaseResponse queryCardNoType(){ return residentsArchiveFacade.queryCardNoType(); } + //返回血型类型 + @RequestMapping(value = "/getBloodType", method = RequestMethod.GET) + @ResponseBody + public BaseResponse getBloodType(){ + return residentsArchiveFacade.getBloodType(); + } + /** * 数据导出接口 * @param residentsArchiveQueryRequest diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index 75e99c6..58d55a8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -11,7 +11,9 @@ import com.lyms.platform.operate.web.request.FolicAcidAddRequest; import com.lyms.platform.operate.web.request.FolicAcidQueryRequest; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.FolicAcid; import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.query.FolicAcidQuery; @@ -35,14 +37,58 @@ public class FolicAcidFacade { private FolicAcidService folicAcidService; @Autowired private OrganizationService organizationService; + @Autowired + private AutoMatchFacade autoMatchFacade; + @Autowired + private UsersService usersService; public BaseResponse addOrUpdateFolicAcid(FolicAcidAddRequest addRequest,Integer userId){ + BaseObjectResponse br = new BaseObjectResponse(); + String id = null; - if (StringUtils.isNotEmpty(addRequest.getParentId())){ + + //判断是否需要给妇女快捷建档 + if (StringUtils.isEmpty(addRequest.getParentId())){ + + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); + archiveQuery.setYn(YnEnums.YES.getId()); + String hospitalId = autoMatchFacade.getHospitalId(userId); + archiveQuery.setHospitalId(hospitalId); + //判断证件号是否在同一家医院已经建档 + if (StringUtils.isNotEmpty(addRequest.getCardNo())){ + archiveQuery.setCertificateNum(addRequest.getCardNo()); +// archiveQuery.setCertificateTypeId(addRequest.getCertificateTypeId()); + List modelList = residentsArchiveService.queryResident(archiveQuery); + if (CollectionUtils.isNotEmpty(modelList)){ + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该证件号在医院已经建档"); + return br; + }else { + //进行建档 + ResidentsArchiveModel model = new ResidentsArchiveModel(); + model.setYn(YnEnums.YES.getId()); + model.setCreated(new Date()); + model.setModified(new Date()); + model.setPublishId(String.valueOf(userId)); + Users users = usersService.getUsers(userId); + if (users!=null && users.getYn()!=YnEnums.NO.getId()){ + model.setPublishName(users.getName()); + } + model.setHospitalId(hospitalId); + + model.setUsername(addRequest.getUsername()); + model.setCertificateNum(addRequest.getCardNo()); + model.setCertificateTypeId(addRequest.getCertificateTypeId()); + model.setBirthday(addRequest.getBirthday()); + model.setAge(addRequest.getAge()); + model.setPhone(addRequest.getPhone()); + residentsArchiveService.addResident(model); + } + } + }else { id = addOrUpdate(addRequest,userId,addRequest.getParentId()); } - BaseObjectResponse br = new BaseObjectResponse(); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 0f62f8f..dba56a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -521,6 +521,16 @@ public class ResidentsArchiveFacade{ return response; } + public BaseObjectResponse getBloodType(){ + BaseObjectResponse response = new BaseObjectResponse(); + + List pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.XUEXING); + response.setData(pcerteTypeResult); + response.setErrorcode(ErrorCodeConstants.SUCCESS); + response.setErrormsg("成功"); + return response; + } + //数据导出 public void residentsArchiveExport(ResidentsArchiveQueryRequest queryRequest,Integer userId,HttpServletResponse response){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidAddRequest.java index 75cd862..399545c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidAddRequest.java @@ -7,6 +7,22 @@ import java.util.Date; */ public class FolicAcidAddRequest { + /* 妇女信息 */ + //姓名 + private String username; + //证件类型Id + private String certificateTypeId; + //证件号 + private String cardNo; + //出生日期 + private String birthday; + //年龄 + private Integer age; + //联系方式 + private String phone; + //就诊卡 + private String vcCardNo; + private String id; private String parentId; @@ -28,6 +44,63 @@ public class FolicAcidAddRequest { //领取时间 private Date drawTime; + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getCertificateTypeId() { + return certificateTypeId; + } + + public void setCertificateTypeId(String certificateTypeId) { + this.certificateTypeId = certificateTypeId; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + public String getId() { return id; }