jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e4b08764ab5ec0e2608ca6e2b4f382da43cc9f78

Authored by wtt
1 parent 6298837b88
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 15 changed files with 159 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ e4b0876
... ... @@ -113,6 +113,8 @@
113 113 * 小孩名称
114 114 */
115 115 private String name;
  116 + //儿童社保卡
  117 + private String sINCard;
116 118 /**
117 119 * 1, "有效",0, "无效"
118 120 * 如果是孕妇分娩自动建档则无效，当完善时修改成有效
... ... @@ -1250,6 +1252,14 @@
1250 1252  
1251 1253 public void setMcertNo(String mcertNo) {
1252 1254 this.mcertNo = mcertNo;
  1255 + }
  1256 +
  1257 + public String getsINCard() {
  1258 + return sINCard;
  1259 + }
  1260 +
  1261 + public void setsINCard(String sINCard) {
  1262 + this.sINCard = sINCard;
1253 1263 }
1254 1264  
1255 1265 public String getMcertTypeId() {
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ e4b0876
... ... @@ -22,6 +22,8 @@
22 22 // 编码唯一，通过编码获取档案信息，编码格式20200721001
23 23 private String encoded;
24 24  
  25 + private String sINCard;
  26 +
25 27 private boolean encodedNe;
26 28  
27 29 private String id;
... ... @@ -376,6 +378,14 @@
376 378 return encodedNe;
377 379 }
378 380  
  381 + public String getsINCard() {
  382 + return sINCard;
  383 + }
  384 +
  385 + public void setsINCard(String sINCard) {
  386 + this.sINCard = sINCard;
  387 + }
  388 +
379 389 public void setEncodedNe(boolean encodedNe) {
380 390 this.encodedNe = encodedNe;
381 391 }
... ... @@ -942,6 +952,9 @@
942 952  
943 953 if (null != encoded) {
944 954 condition = condition.and("encoded", encoded, MongoOper.IS);
  955 + }
  956 + if (null != sINCard) {
  957 + condition = condition.and("sINCard", sINCard, MongoOper.IS);
945 958 }
946 959 if (encodedNe) {
947 960 condition = condition.and("encoded", null, MongoOper.NE);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ e4b0876
... ... @@ -145,12 +145,17 @@
145 145 @RequestMapping(value = "/queryBabyBuildRecord", method = RequestMethod.GET)
146 146 @ResponseBody
147 147 @TokenRequired
148   - 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) {
  148 + public BaseObjectResponse queryBabyBuildRecord(HttpServletRequest request, @RequestParam(required = false) String cardNo,
  149 + @RequestParam(required = false) String encoded,
  150 + @RequestParam(required = false) String sINCard,
  151 + @RequestParam(required = false) String vcCardNo,
  152 + @RequestParam(required = false) String hospitalId) {
149 153 BookbuildingQueryRequest param = new BookbuildingQueryRequest();
150 154 param.setEncoded(encoded);
151 155 param.setCardNo(cardNo);
152 156 param.setVcCardNo(vcCardNo);
153 157 param.setHospitalId(hospitalId);
  158 + param.setsINCard(sINCard);
154 159 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
155 160 return babyBookbuildingFacade.queryBabyBuildRecord(param, loginState.getId());
156 161 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ e4b0876
... ... @@ -126,9 +126,10 @@
126 126 public BaseObjectResponse queryChooseBabys(HttpServletRequest request, @RequestParam(required = false) String vcCardNo,
127 127 @RequestParam(required = false) String cardNo,
128 128 @RequestParam(required = false) String encoded,
  129 + @RequestParam(required = false) String sINCard,
129 130 String coupon, @RequestParam(required = false) String ynStatus) {
130 131 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
131   - return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo,encoded, loginState.getId(), coupon, ynStatus);
  132 + return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo,encoded,sINCard, loginState.getId(), coupon, ynStatus);
132 133 }
133 134  
134 135  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ e4b0876
... ... @@ -1141,6 +1141,7 @@
1141 1141 if (StringUtils.isEmpty(b.getId())) {
1142 1142 bm.setEncoded(b.getEncoded());
1143 1143 }
  1144 + bm.setsINCard(b.getsINCard());//儿童社保卡
1144 1145 //预建档的要加上编码
1145 1146 if (b.getYn() != null && b.getYn() == 0 && StringUtils.isEmpty(b.getEncoded())) {
1146 1147 String encodedUtil = getEncodedUtil();
... ... @@ -1490,6 +1491,7 @@
1490 1491 BabyBuildResult result = new BabyBuildResult();
1491 1492 result.setEncoded(model.getEncoded());//儿童建档编码
1492 1493 result.setBnationId(model.getBnationId());//儿童民族
  1494 + result.setsINCard(model.getsINCard());//儿童社保卡
1493 1495  
1494 1496 result.setLiveType(model.getLiveType());
1495 1497 result.setYn(model.getYn());
1496 1498  
... ... @@ -1890,12 +1892,22 @@
1890 1892 }
1891 1893  
1892 1894 puerperaQuery.setPhoneOrCert(param.getCardNo());
1893   - } else if ((param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) || StringUtils.isNotEmpty(param.getEncoded())) {
  1895 + } else if ((param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo()))
  1896 + || StringUtils.isNotEmpty(param.getEncoded()) //编码
  1897 + || StringUtils.isNotEmpty(param.getsINCard())//社保卡
  1898 + ) {
1894 1899  
1895 1900 BabyModelQuery babyQuery = new BabyModelQuery();
1896 1901 babyQuery.setYn(YnEnums.YES.getId());
1897   - babyQuery.setVcCardNo(param.getVcCardNo());
1898   - babyQuery.setEncoded(param.getEncoded());
  1902 + if(StringUtils.isNotEmpty(param.getVcCardNo())){
  1903 + babyQuery.setVcCardNo(param.getVcCardNo());
  1904 + }
  1905 + if(StringUtils.isNotEmpty(param.getEncoded())){
  1906 + babyQuery.setEncoded(param.getEncoded());
  1907 + }
  1908 + if(StringUtils.isNotEmpty(param.getsINCard())){
  1909 + babyQuery.setsINCard(param.getsINCard());
  1910 + }
1899 1911 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))) {
1900 1912 List list = new ArrayList();
1901 1913 list.add("1");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ e4b0876
... ... @@ -1375,7 +1375,7 @@
1375 1375 * @param coupon
1376 1376 * @return
1377 1377 */
1378   - public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo,String encoded, Integer userId, String coupon, String ynStatus) {
  1378 + public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo,String encoded, String sINCard,Integer userId, String coupon, String ynStatus) {
1379 1379  
1380 1380  
1381 1381 Map map = new HashMap();
1382 1382  
... ... @@ -1394,11 +1394,17 @@
1394 1394 boolean isBuild = false;
1395 1395 List<BabyChooseResult> results = new ArrayList<>();
1396 1396  
1397   - if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo) || StringUtils.isNotEmpty(coupon)|| StringUtils.isNotEmpty(encoded) ) {
  1397 + if (!StringUtils.isEmpty(vcCardNo)
  1398 + || !StringUtils.isEmpty(cardNo)
  1399 + || StringUtils.isNotEmpty(coupon)
  1400 + || StringUtils.isNotEmpty(encoded)
  1401 + || StringUtils.isNotEmpty(sINCard)
  1402 + ) {
1398 1403 BabyModelQuery babyQuery = new BabyModelQuery();
1399 1404 babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码
1400 1405 babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo);
1401 1406 babyQuery.setEncoded(StringUtils.isEmpty(encoded) ? null : encoded);
  1407 + babyQuery.setsINCard(StringUtils.isEmpty(sINCard) ? null : sINCard);
1402 1408 if (StringUtils.isNotEmpty(ynStatus)) {
1403 1409 babyQuery.setDataStatus(false);
1404 1410 } else {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ e4b0876
... ... @@ -1517,6 +1517,9 @@
1517 1517 }
1518 1518 babyEarBaseView.setCardNo(babyEarBase.getCardNo());
1519 1519 babyEarBaseView.setEncoded(babyEarBase.getEncoded());
  1520 + babyEarBaseView.setsINCard(babyEarBase.getsINCard());
  1521 +
  1522 +
1520 1523 if (babyEarBase.getNation() != null) {
1521 1524 babyEarBaseView.setNation(mongoUtil.findName(babyEarBase.getNation()));
1522 1525 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ e4b0876
... ... @@ -421,7 +421,30 @@
421 421 }
422 422 babyCheckModelQuery.setHospitalId(hospitalId);
423 423  
  424 + //性别查询
  425 + if(StringUtils.isNotEmpty(babyStatisticsManagerWeekAgeGroupRequest.getSex())){
  426 + BabyModelQuery babyQuery = new BabyModelQuery();
  427 + babyQuery.setSex(Integer.parseInt(babyStatisticsManagerWeekAgeGroupRequest.getSex()));
  428 + babyQuery.setYn(YnEnums.YES.getId());
  429 + List<BabyModel> babies = babyService.queryBabyWithQuery(babyQuery);
  430 + List<String> babieslist = new ArrayList();
  431 + for (int i = 0; i < babies.size(); i++) {
  432 + BabyModel babyModel = babies.get(i);
  433 + if(babyModel!=null && StringUtils.isNotEmpty(babyModel.getId())){
  434 + babieslist.add(babyModel.getId());
  435 + }
  436 + }
  437 + //在筛选儿保检查
  438 + babyCheckModelQuery.setNeed("need");
  439 + if(CollectionUtils.isNotEmpty(babieslist)){
  440 + String[] strings = new String[babieslist.size()];
  441 + babyCheckModelQuery.setBuildIds(babieslist.toArray(strings));
  442 + }else {
  443 + babyCheckModelQuery.mysqlBuild(0);
  444 + }
  445 + }
424 446 List<HashMap> temp = babyCheckService.babyStatisticsManagerWeekAgeGroup(babyCheckModelQuery);
  447 +
425 448 List<BabyStatisticsManagerWeekAgeGroupQueryModel> babyStatisticsManagerWeekAgeGroupQueryModelList = new ArrayList<>();
426 449  
427 450 if (CollectionUtils.isNotEmpty(temp)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ e4b0876
... ... @@ -120,6 +120,8 @@
120 120 private Integer sex;
121 121 //儿童身份证
122 122 private String babyCardNo;
  123 + //儿童社保卡
  124 + private String sINCard;
123 125 //儿童生日
124 126 @FormParam
125 127 @NotEmpty(message = "儿童生日不能为空")
... ... @@ -363,6 +365,14 @@
363 365  
364 366 public void setDataStatus(Integer dataStatus) {
365 367 this.dataStatus = dataStatus;
  368 + }
  369 +
  370 + public String getsINCard() {
  371 + return sINCard;
  372 + }
  373 +
  374 + public void setsINCard(String sINCard) {
  375 + this.sINCard = sINCard;
366 376 }
367 377  
368 378 public boolean isJxWn() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java View file @ e4b0876
... ... @@ -37,6 +37,9 @@
37 37  
38 38 // 编码唯一，通过编码获取档案信息，编码格式20200721001
39 39 private String encoded;
  40 +
  41 + private String sINCard;
  42 +
40 43 //儿童生日
41 44 private String birth;
42 45 //民族
... ... @@ -162,6 +165,14 @@
162 165 this.encoded = encoded;
163 166 }
164 167  
  168 + public String getsINCard() {
  169 + return sINCard;
  170 + }
  171 +
  172 + public void setsINCard(String sINCard) {
  173 + this.sINCard = sINCard;
  174 + }
  175 +
165 176 public BabyEarBase(BabyModel babyModel) {
166 177 setFileCode(babyModel.getFileCode());
167 178 setBabyId(babyModel.getId());
... ... @@ -169,6 +180,8 @@
169 180 setName(babyModel.getName());
170 181 setCardNo(babyModel.getCardNo());
171 182 setEncoded(babyModel.getEncoded());
  183 + setsINCard(babyModel.getsINCard());
  184 +
172 185 setBirth(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
173 186 setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
174 187 setProvinceId(babyModel.getProvinceId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStatisticsManagerWeekAgeGroupRequest.java View file @ e4b0876
... ... @@ -9,7 +9,17 @@
9 9  
10 10 private String checkDate;
11 11  
  12 + private String sex;
  13 +
12 14 private Integer operatorId;
  15 +
  16 + public String getSex() {
  17 + return sex;
  18 + }
  19 +
  20 + public void setSex(String sex) {
  21 + this.sex = sex;
  22 + }
13 23  
14 24 public String getCheckDate() {
15 25 return checkDate;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java View file @ e4b0876
... ... @@ -17,7 +17,18 @@
17 17 private String bookbuildingType;
18 18 // 编码唯一，通过编码获取档案信息，编码格式20200721001
19 19 private String encoded;
  20 +
  21 + private String sINCard;
  22 +
20 23 private String pid;
  24 +
  25 + public String getsINCard() {
  26 + return sINCard;
  27 + }
  28 +
  29 + public void setsINCard(String sINCard) {
  30 + this.sINCard = sINCard;
  31 + }
21 32  
22 33 public String getPid() {
23 34 return pid;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ e4b0876
... ... @@ -71,6 +71,9 @@
71 71 /***********儿童信息***********/
72 72 // 编码唯一，通过编码获取档案信息，编码格式20200721001
73 73 private String encoded;
  74 +
  75 + private String sINCard;
  76 +
74 77 //新生儿民族Id
75 78 private String bnationId;
76 79 //儿童名称
... ... @@ -346,6 +349,14 @@
346 349  
347 350 public void setBabyHighRiskReason(List<Map<String, Object>> babyHighRiskReason) {
348 351 this.babyHighRiskReason = babyHighRiskReason;
  352 + }
  353 +
  354 + public String getsINCard() {
  355 + return sINCard;
  356 + }
  357 +
  358 + public void setsINCard(String sINCard) {
  359 + this.sINCard = sINCard;
349 360 }
350 361  
351 362 public String getEncoded() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java View file @ e4b0876
... ... @@ -10,6 +10,9 @@
10 10 public class BabyEarBaseView {
11 11 // 编码唯一，通过编码获取档案信息，编码格式20200721001
12 12 private String encoded;
  13 +
  14 + private String sINCard;
  15 +
13 16 private String id;
14 17 private String babyId;
15 18 //儿童名字
... ... @@ -107,6 +110,14 @@
107 110  
108 111 //档案编号 滦平需求
109 112 private String fileCode;
  113 +
  114 + public String getsINCard() {
  115 + return sINCard;
  116 + }
  117 +
  118 + public void setsINCard(String sINCard) {
  119 + this.sINCard = sINCard;
  120 + }
110 121  
111 122 public String getFileCode() {
112 123 return fileCode;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ e4b0876
... ... @@ -44,6 +44,10 @@
44 44  
45 45 // 编码唯一，通过编码获取档案信息，编码格式20200721001
46 46 private String encoded;
  47 +
  48 + //儿童社保卡
  49 + private String sINCard;
  50 +
47 51 //新生儿民族Id
48 52 private String bnationId;
49 53  
50 54  
... ... @@ -1007,9 +1011,18 @@
1007 1011 this.blNo = blNo;
1008 1012 }
1009 1013  
  1014 + public String getsINCard() {
  1015 + return sINCard;
  1016 + }
  1017 +
  1018 + public void setsINCard(String sINCard) {
  1019 + this.sINCard = sINCard;
  1020 + }
  1021 +
1010 1022 @Override
1011 1023 public BabyPageResult convertToResult(BabyModel destModel) {
1012 1024 List<String> list = destModel.getmHighRiskReason();
  1025 + setsINCard(destModel.getsINCard());
1013 1026 setId(destModel.getId());
1014 1027 setPid(destModel.getPid());
1015 1028 setBabyName(destModel.getName());