diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index e1a91df..15204ac 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -113,6 +113,8 @@ public class BabyModel extends BaseModel { * 小孩名称 */ private String name; + //儿童社保卡 + private String sINCard; /** * 1, "有效",0, "无效" * 如果是孕妇分娩自动建档则无效，当完善时修改成有效 @@ -1252,6 +1254,14 @@ public class BabyModel extends BaseModel { this.mcertNo = mcertNo; } + public String getsINCard() { + return sINCard; + } + + public void setsINCard(String sINCard) { + this.sINCard = sINCard; + } + public String getMcertTypeId() { return mcertTypeId; } 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 e6fa70f..11de69e 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 @@ -22,6 +22,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { // 编码唯一，通过编码获取档案信息，编码格式20200721001 private String encoded; + private String sINCard; + private boolean encodedNe; private String id; @@ -376,6 +378,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { return encodedNe; } + public String getsINCard() { + return sINCard; + } + + public void setsINCard(String sINCard) { + this.sINCard = sINCard; + } + public void setEncodedNe(boolean encodedNe) { this.encodedNe = encodedNe; } @@ -943,6 +953,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != encoded) { condition = condition.and("encoded", encoded, MongoOper.IS); } + if (null != sINCard) { + condition = condition.and("sINCard", sINCard, MongoOper.IS); + } if (encodedNe) { condition = condition.and("encoded", null, MongoOper.NE); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index a7f0532..8560dc2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -145,12 +145,17 @@ public class BabyBuildController extends BaseController { @RequestMapping(value = "/queryBabyBuildRecord", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse queryBabyBuildRecord(HttpServletRequest request, @RequestParam(required = false) String cardNo, @RequestParam(required = false) String encoded, @RequestParam(required = false) String vcCardNo, @RequestParam(required = false) String hospitalId) { + public BaseObjectResponse queryBabyBuildRecord(HttpServletRequest request, @RequestParam(required = false) String cardNo, + @RequestParam(required = false) String encoded, + @RequestParam(required = false) String sINCard, + @RequestParam(required = false) String vcCardNo, + @RequestParam(required = false) String hospitalId) { BookbuildingQueryRequest param = new BookbuildingQueryRequest(); param.setEncoded(encoded); param.setCardNo(cardNo); param.setVcCardNo(vcCardNo); param.setHospitalId(hospitalId); + param.setsINCard(sINCard); LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return babyBookbuildingFacade.queryBabyBuildRecord(param, loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index a0e2cc0..80c4b5b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -126,9 +126,10 @@ public class BabyCheckController extends BaseController { public BaseObjectResponse queryChooseBabys(HttpServletRequest request, @RequestParam(required = false) String vcCardNo, @RequestParam(required = false) String cardNo, @RequestParam(required = false) String encoded, + @RequestParam(required = false) String sINCard, String coupon, @RequestParam(required = false) String ynStatus) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo,encoded, loginState.getId(), coupon, ynStatus); + return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo,encoded,sINCard, loginState.getId(), coupon, ynStatus); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index a641999..38da6e1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1141,6 +1141,7 @@ public class BabyBookbuildingFacade { if (StringUtils.isEmpty(b.getId())) { bm.setEncoded(b.getEncoded()); } + bm.setsINCard(b.getsINCard());//儿童社保卡 //预建档的要加上编码 if (b.getYn() != null && b.getYn() == 0 && StringUtils.isEmpty(b.getEncoded())) { String encodedUtil = getEncodedUtil(); @@ -1490,6 +1491,7 @@ public class BabyBookbuildingFacade { BabyBuildResult result = new BabyBuildResult(); result.setEncoded(model.getEncoded());//儿童建档编码 result.setBnationId(model.getBnationId());//儿童民族 + result.setsINCard(model.getsINCard());//儿童社保卡 result.setLiveType(model.getLiveType()); result.setYn(model.getYn()); @@ -1890,12 +1892,22 @@ public class BabyBookbuildingFacade { } puerperaQuery.setPhoneOrCert(param.getCardNo()); - } else if ((param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) || StringUtils.isNotEmpty(param.getEncoded())) { + } else if ((param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) + || StringUtils.isNotEmpty(param.getEncoded()) //编码 + || StringUtils.isNotEmpty(param.getsINCard())//社保卡 + ) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setVcCardNo(param.getVcCardNo()); - babyQuery.setEncoded(param.getEncoded()); + if(StringUtils.isNotEmpty(param.getVcCardNo())){ + babyQuery.setVcCardNo(param.getVcCardNo()); + } + if(StringUtils.isNotEmpty(param.getEncoded())){ + babyQuery.setEncoded(param.getEncoded()); + } + if(StringUtils.isNotEmpty(param.getsINCard())){ + babyQuery.setsINCard(param.getsINCard()); + } if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))) { List list = new ArrayList(); list.add("1"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index f1a24da..0dd8bf8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1375,7 +1375,7 @@ public class BabyCheckFacade extends BaseServiceImpl { * @param coupon * @return */ - public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo,String encoded, Integer userId, String coupon, String ynStatus) { + public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo,String encoded, String sINCard,Integer userId, String coupon, String ynStatus) { Map map = new HashMap(); @@ -1394,11 +1394,17 @@ public class BabyCheckFacade extends BaseServiceImpl { boolean isBuild = false; List results = new ArrayList<>(); - if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo) || StringUtils.isNotEmpty(coupon)|| StringUtils.isNotEmpty(encoded) ) { + if (!StringUtils.isEmpty(vcCardNo) + || !StringUtils.isEmpty(cardNo) + || StringUtils.isNotEmpty(coupon) + || StringUtils.isNotEmpty(encoded) + || StringUtils.isNotEmpty(sINCard) + ) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码 babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo); babyQuery.setEncoded(StringUtils.isEmpty(encoded) ? null : encoded); + babyQuery.setsINCard(StringUtils.isEmpty(sINCard) ? null : sINCard); if (StringUtils.isNotEmpty(ynStatus)) { babyQuery.setDataStatus(false); } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index c89ae20..7a5fe33 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1517,6 +1517,9 @@ public class BabyEarFacade { } babyEarBaseView.setCardNo(babyEarBase.getCardNo()); babyEarBaseView.setEncoded(babyEarBase.getEncoded()); + babyEarBaseView.setsINCard(babyEarBase.getsINCard()); + + if (babyEarBase.getNation() != null) { babyEarBaseView.setNation(mongoUtil.findName(babyEarBase.getNation())); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index 8c3b130..d15f8e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -421,7 +421,30 @@ public class BabyStatisticsManagerFacade { } babyCheckModelQuery.setHospitalId(hospitalId); + //性别查询 + if(StringUtils.isNotEmpty(babyStatisticsManagerWeekAgeGroupRequest.getSex())){ + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setSex(Integer.parseInt(babyStatisticsManagerWeekAgeGroupRequest.getSex())); + babyQuery.setYn(YnEnums.YES.getId()); + List babies = babyService.queryBabyWithQuery(babyQuery); + List babieslist = new ArrayList(); + for (int i = 0; i < babies.size(); i++) { + BabyModel babyModel = babies.get(i); + if(babyModel!=null && StringUtils.isNotEmpty(babyModel.getId())){ + babieslist.add(babyModel.getId()); + } + } + //在筛选儿保检查 + babyCheckModelQuery.setNeed("need"); + if(CollectionUtils.isNotEmpty(babieslist)){ + String[] strings = new String[babieslist.size()]; + babyCheckModelQuery.setBuildIds(babieslist.toArray(strings)); + }else { + babyCheckModelQuery.mysqlBuild(0); + } + } List temp = babyCheckService.babyStatisticsManagerWeekAgeGroup(babyCheckModelQuery); + List babyStatisticsManagerWeekAgeGroupQueryModelList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(temp)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index a774781..02ea248 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -120,6 +120,8 @@ public class BabyBookbuildingAddRequest { private Integer sex; //儿童身份证 private String babyCardNo; + //儿童社保卡 + private String sINCard; //儿童生日 @FormParam @NotEmpty(message = "儿童生日不能为空") @@ -365,6 +367,14 @@ public class BabyBookbuildingAddRequest { this.dataStatus = dataStatus; } + public String getsINCard() { + return sINCard; + } + + public void setsINCard(String sINCard) { + this.sINCard = sINCard; + } + public boolean isJxWn() { return jxWn; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java index 97f633f..12da099 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java @@ -37,6 +37,9 @@ public class BabyEarBase implements IBasicRequestConvert { // 编码唯一，通过编码获取档案信息，编码格式20200721001 private String encoded; + + private String sINCard; + //儿童生日 private String birth; //民族 @@ -162,6 +165,14 @@ public class BabyEarBase implements IBasicRequestConvert { this.encoded = encoded; } + public String getsINCard() { + return sINCard; + } + + public void setsINCard(String sINCard) { + this.sINCard = sINCard; + } + public BabyEarBase(BabyModel babyModel) { setFileCode(babyModel.getFileCode()); setBabyId(babyModel.getId()); @@ -169,6 +180,8 @@ public class BabyEarBase implements IBasicRequestConvert { setName(babyModel.getName()); setCardNo(babyModel.getCardNo()); setEncoded(babyModel.getEncoded()); + setsINCard(babyModel.getsINCard()); + setBirth(DateUtil.getyyyy_MM_dd(babyModel.getBirth())); setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); setProvinceId(babyModel.getProvinceId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStatisticsManagerWeekAgeGroupRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStatisticsManagerWeekAgeGroupRequest.java index 4a400e9..f1df0eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStatisticsManagerWeekAgeGroupRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStatisticsManagerWeekAgeGroupRequest.java @@ -9,8 +9,18 @@ public class BabyStatisticsManagerWeekAgeGroupRequest extends BasePageQueryReque private String checkDate; + private String sex; + private Integer operatorId; + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + public String getCheckDate() { return checkDate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java index dfdeed0..9a75083 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java @@ -17,8 +17,19 @@ public class BookbuildingQueryRequest { private String bookbuildingType; // 编码唯一，通过编码获取档案信息，编码格式20200721001 private String encoded; + + private String sINCard; + private String pid; + public String getsINCard() { + return sINCard; + } + + public void setsINCard(String sINCard) { + this.sINCard = sINCard; + } + public String getPid() { return pid; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index a33fd9f..6f8c525 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -71,6 +71,9 @@ public class BabyBuildResult { /***********儿童信息***********/ // 编码唯一，通过编码获取档案信息，编码格式20200721001 private String encoded; + + private String sINCard; + //新生儿民族Id private String bnationId; //儿童名称 @@ -348,6 +351,14 @@ public class BabyBuildResult { this.babyHighRiskReason = babyHighRiskReason; } + public String getsINCard() { + return sINCard; + } + + public void setsINCard(String sINCard) { + this.sINCard = sINCard; + } + public String getEncoded() { return encoded; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java index 9e1819e..58e4a06 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java @@ -10,6 +10,9 @@ import java.util.List; public class BabyEarBaseView { // 编码唯一，通过编码获取档案信息，编码格式20200721001 private String encoded; + + private String sINCard; + private String id; private String babyId; //儿童名字 @@ -108,6 +111,14 @@ public class BabyEarBaseView { //档案编号 滦平需求 private String fileCode; + public String getsINCard() { + return sINCard; + } + + public void setsINCard(String sINCard) { + this.sINCard = sINCard; + } + public String getFileCode() { return fileCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index f1e2a00..2cd9c55 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -44,6 +44,10 @@ public class BabyPageResult implements IBasicResultConvert list = destModel.getmHighRiskReason(); + setsINCard(destModel.getsINCard()); setId(destModel.getId()); setPid(destModel.getPid()); setBabyName(destModel.getName());