From 0d62cad68da1ee35158927f26e102cbb9cdba2ee Mon Sep 17 00:00:00 2001 From: landong2015 Date: Tue, 13 Dec 2016 14:33:32 +0800 Subject: [PATCH] update --- .../operate/web/facade/FolicAcidFacade.java | 79 ++++++++++++---------- .../operate/web/facade/FunvCommonUtil.java | 21 ------ .../operate/web/facade/ResidentsArchiveFacade.java | 6 +- .../platform/operate/web/utils/FunvCommonUtil.java | 48 +++++++++++++ 4 files changed, 94 insertions(+), 60 deletions(-) delete mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FunvCommonUtil.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java 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 26d1d15..aa64cc6 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 @@ -15,6 +15,7 @@ import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.FolicAcidAddRequest; import com.lyms.platform.operate.web.request.FolicAcidQueryRequest; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; @@ -64,53 +65,61 @@ public class FolicAcidFacade { //判断是否需要给妇女快捷建档 if (StringUtils.isEmpty(addRequest.getParentId())){ + List modelList = new ArrayList<>(); ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); archiveQuery.setYn(YnEnums.YES.getId()); String hospitalId = autoMatchFacade.getHospitalId(userId); archiveQuery.setHospitalId(hospitalId); //判断证件号是否在同一家医院已经建档 - if (StringUtils.isNotEmpty(addRequest.getCardNo())){ + if (StringUtils.isNotEmpty(addRequest.getCardNo())) { archiveQuery.setCertificateNum(addRequest.getCardNo()); -// archiveQuery.setCertificateTypeId(addRequest.getCertificateTypeId()); - List modelList = residentsArchiveService.queryResident(archiveQuery); - if (CollectionUtils.isNotEmpty(modelList)){ + archiveQuery.setCertificateTypeId(addRequest.getCertificateTypeId()); + residentsArchiveService.queryResident(archiveQuery); + if (CollectionUtils.isNotEmpty(modelList)) { br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("该证件号在医院已经建档"); + 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.setBuildDoctor(users.getName()); - } - model.setHospitalId(hospitalId); + } + }else if (StringUtils.isNotEmpty(addRequest.getVcCardNo())){ + archiveQuery.setVcCardNo(addRequest.getVcCardNo()); + modelList = residentsArchiveService.queryResident(archiveQuery); + if (CollectionUtils.isNotEmpty(modelList)) { + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该就诊卡在该医院已经建档"); + return br; + } + } + //进行建档 + 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.setBuildDoctor(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()); + model.setUsername(addRequest.getUsername()); + model.setCertificateNum(addRequest.getCardNo()); + model.setCertificateTypeId(addRequest.getCertificateTypeId()); + model.setBirthday(addRequest.getBirthday()); + model.setAge(addRequest.getAge()); + model.setPhone(addRequest.getPhone()); - model.setSex(SystemConfig.WOMAN_ID); - //建档日期 - model.setBuildDay(DateUtil.getyyyy_MM_dd(new Date())); + model.setSex(SystemConfig.WOMAN_ID); + //建档日期 + model.setBuildDay(DateUtil.getyyyy_MM_dd(new Date())); - model.setVcCardNo(addRequest.getVcCardNo()); + model.setVcCardNo(addRequest.getVcCardNo()); - ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model); + ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model); - id = addOrUpdate(addRequest,userId,residentsArchiveModel.getId()); - } - } + id = addOrUpdate(addRequest,userId,residentsArchiveModel.getId()); }else { id = addOrUpdate(addRequest,userId,addRequest.getParentId()); } @@ -189,7 +198,7 @@ public class FolicAcidFacade { archiveMap.put("username", archiveModel.getUsername()); archiveMap.put("birthday",archiveModel.getBirthday()); archiveMap.put("age", StringUtils.isEmpty(archiveModel.getBirthday()) ? "" : DateUtil.getAge(DateUtil.parseYMD(archiveModel.getBirthday()))); - archiveMap.put("phone", archiveModel.getPhone()); + archiveMap.put("phone", FunvCommonUtil.getXingPhone(archiveModel.getPhone())); archiveMap.put("id", archiveModel.getId()); if (StringUtils.isEmpty(archiveModel.getSex()) || archiveModel.getSex().equals(SystemConfig.WOMAN_ID )){ archiveMap.put("sex", "女"); @@ -316,7 +325,7 @@ public class FolicAcidFacade { ResidentsArchiveModel model = residentsArchiveService.getResident(data.getParentId()); map.put("username",model.getUsername()); map.put("certificateNum",model.getCertificateNum()); - map.put("phone",FunvCommonUtil.getXingPhone(model.getPhone())); + map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); map.put("drawTime", DateUtil.getyyyy_MM_dd(data.getDrawTime())); map.put("drawCount", data.getDrawCount()); if (data.getPregnancyType()!=null){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FunvCommonUtil.java deleted file mode 100644 index ee20318..0000000 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FunvCommonUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lyms.platform.operate.web.facade; - -import org.apache.commons.lang.StringUtils; - -/** - * 妇女模块公共方法 - * - * Created by Administrator on 2016/12/13 0013. - */ -public class FunvCommonUtil { - - //返回中间四位数为*号的手机号 - public static String getXingPhone(String phone){ - if (StringUtils.isNotEmpty(phone)){ - String a = phone.substring(0,3)+"****"+phone.substring(7,11); - return a; - } - return ""; - } - -} 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 1138c51..3da0dbf 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 @@ -18,6 +18,7 @@ import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.result.ResidentsArchiveHistoryResult; import com.lyms.platform.operate.web.result.ResidentsArchiveResult; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; @@ -27,11 +28,8 @@ import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.PremaritalCheckup; import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.pojo.SmsConfigModel; -import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.PremaritalCheckupQuery; import com.lyms.platform.query.ResidentsArchiveQuery; -import com.mongodb.util.JSON; -import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -487,7 +485,7 @@ public class ResidentsArchiveFacade{ map.put("age",DateUtil.getAge(DateUtil.parseYMD(model.getBirthday()))); map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId())); - map.put("phone",FunvCommonUtil.getXingPhone(model.getPhone())); + map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); map.put("buildDoctor",model.getBuildDoctor()); data.add(map); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java new file mode 100644 index 0000000..fdf8634 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java @@ -0,0 +1,48 @@ +package com.lyms.platform.operate.web.utils; + +import org.apache.commons.lang.StringUtils; + +/** + * 妇女模块公共方法 + * + * Created by Administrator on 2016/12/13 0013. + */ +public class FunvCommonUtil { + + public static String HAVE = "有"; + public static String NOT = "无"; + public static String NORMAL = "正常"; + public static String ABNORMAL = "异常"; + + //返回中间四位数为*号的手机号 + public static String getXingPhone(String phone){ + if (StringUtils.isNotEmpty(phone)){ + String a = phone.substring(0,3)+"****"+phone.substring(7,11); + return a; + } + return ""; + } + + public static String havaOrNOString(String s){ + if (StringUtils.isNotEmpty(s)){ + if (s.equals("1")){ + return HAVE; + }else { + return NOT; + } + } + return NOT; + } + + public static String havaOrNOInteger(Integer i){ + if (i!=null){ + if (i==1){ + return HAVE; + }else { + return NOT; + } + } + return NOT; + } + +} -- 1.8.3.1