jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c66ee6835623d447b5055786c9b56b83cea170a6

Authored by liquanyu
1 parent 72d344d344
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

滦平妇幼修改

Showing 4 changed files with 31 additions and 8 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ c66ee68
... ... @@ -1879,7 +1879,7 @@
1879 1879 public static void main(String[] args) {
1880 1880 System.out.println(getBabyMonthAge(parseYMD("2022-06-15"),new Date()));
1881 1881  
1882   -// Date startDate = DateUtil.addMonth(new Date(),-12);
  1882 + Date startDate = DateUtil.addMonth(new Date(),-12);
1883 1883 // Date endDate = DateUtil.addDay(startDate, 18);
1884 1884 // System.out.println(getyyyy_MM_dd(startDate));
1885 1885 // System.out.println(getyyyy_MM_dd(endDate));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ c66ee68
... ... @@ -3529,7 +3529,7 @@
3529 3529 }
3530 3530 else if (CollectionUtils.isNotEmpty(babyQuery.getHospitalIdList()) && babyQuery.getHospitalIdList().size() == 1 && "2100002261".equals(babyQuery.getHospitalIdList().get(0)))
3531 3531 {
3532   - models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "birth", Sort.Direction.ASC);
  3532 + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "birth", Sort.Direction.DESC);
3533 3533 }
3534 3534 else
3535 3535 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java View file @ c66ee68
... ... @@ -293,7 +293,7 @@
293 293 // if(StringUtils.isNotEmpty(model.getAreaRegisterId()) && StringUtils.isEmpty(areaName)){
294 294 // areaName=CommonsHelper.getName1(model.getAreaRegisterId(), basicConfigService);
295 295 // }
296   -// map.put("district_nation_code", organizationService.getAreaCode(areaName)+"000");
  296 +// map.put("district_nation_code", organizationService.getAreaCode(areaName));
297 297 // //母亲姓名简拼
298 298 // map.put("mother_en_name",null);
299 299 // //数据上传时间
... ... @@ -531,7 +531,7 @@
531 531 if(StringUtils.isNotEmpty(model.getAreaId()) && StringUtils.isEmpty(areaName)){
532 532 areaName=CommonsHelper.getName1(model.getAreaId(), basicConfigService);
533 533 }
534   - map.put("district_nation_code", organizationService.getAreaCode(areaName)+"000");
  534 + map.put("district_nation_code", organizationService.getAreaCode(areaName));
535 535 //母亲姓名简拼
536 536 map.put("mother_en_name",null);
537 537 //数据上传时间
... ... @@ -740,7 +740,7 @@
740 740 if(StringUtils.isNotEmpty(model.getBabyAreaId()) && StringUtils.isEmpty(areaName)){
741 741 areaName=CommonsHelper.getName1(model.getBabyAreaId(), basicConfigService);
742 742 }
743   - map.put("district_nation_code", organizationService.getAreaCode(areaName)+"000");
  743 + map.put("district_nation_code", organizationService.getAreaCode(areaName));
744 744 //母亲姓名简拼
745 745 map.put("mother_en_name", null);
746 746 //导入时间（存入数据）
747 747  
... ... @@ -1295,10 +1295,17 @@
1295 1295 //接生人员姓名
1296 1296 String mid_wife="/";
1297 1297 if(StringUtils.isNotEmpty(model.getDeliverDoctor())) {
1298   - Users user = usersService.getUsers(Integer.parseInt(model.getDeliverDoctor()));
1299   - if (null!=user && StringUtils.isNotEmpty(user.getName())) {
1300   - mid_wife=user.getName();
  1298 + try{
  1299 + Users user = usersService.getUsers(Integer.parseInt(model.getDeliverDoctor()));
  1300 + if (null!=user && StringUtils.isNotEmpty(user.getName())) {
  1301 + mid_wife=user.getName();
  1302 + }
  1303 + }catch (Exception e)
  1304 + {
  1305 + mid_wife = model.getDeliverDoctor();
1301 1306 }
  1307 +
  1308 +
1302 1309 }
1303 1310 map.put("mid_wife", mid_wife);
1304 1311 //出生地点分类(参考前端分娩页面 分娩地点类型字段)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java View file @ c66ee68
... ... @@ -141,6 +141,22 @@
141 141 result.setLastCheckDoctor("");
142 142 }
143 143 }
  144 + else
  145 + {
  146 +
  147 + try {
  148 + //滦平县妇幼保健院 如果儿童没有检查 就把检查医生显示成建档医生
  149 + if ("2100001377".equals(model.getHospitalId()))
  150 + {
  151 + String userName = usersService.getUsers(Integer.parseInt(model.getBuildDoctor())).getName();
  152 + result.setLastCheckDoctor(userName);
  153 + }
  154 +
  155 + }catch (Exception e)
  156 + {
  157 + result.setLastCheckDoctor("");
  158 + }
  159 + }
144 160  
145 161 if (model.getRiskCode() != null)
146 162 {