jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ae0e57d2a25b08ec2fee01528a561621fd1c6f44

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

update

Showing 3 changed files with 49 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ ae0e57d
... ... @@ -746,6 +746,10 @@
746 746  
747 747 //隆化-口腔检查同步数据
748 748 /**
  749 + * 检查id（同步字段，最后一次检查的id）
  750 + */
  751 + private String oralCheckId;
  752 + /**
749 753 * 检查时间（同步字段）
750 754 */
751 755 private Date oralCheckTime;
... ... @@ -784,6 +788,14 @@
784 788 * 检查月龄套餐
785 789 */
786 790 private String oralCheckMonthId;
  791 +
  792 + public String getOralCheckId() {
  793 + return oralCheckId;
  794 + }
  795 +
  796 + public void setOralCheckId(String oralCheckId) {
  797 + this.oralCheckId = oralCheckId;
  798 + }
787 799  
788 800 public String getOralCheckMonthId() {
789 801 return oralCheckMonthId;
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ ae0e57d
... ... @@ -1325,6 +1325,10 @@
1325 1325  
1326 1326 //隆化-口腔模块
1327 1327 /**
  1328 + * 检查id（同步字段，最后一次检查的id）
  1329 + */
  1330 + private String oralCheckId;
  1331 + /**
1328 1332 * 检查时间-开始
1329 1333 */
1330 1334 private Date oralCheckTimeStart;
... ... @@ -1947,6 +1951,9 @@
1947 1951 }
1948 1952 if (StringUtils.isNotEmpty(oralCheckMonthId)) {
1949 1953 condition = condition.and("wgfb", wgfb, MongoOper.IS);
  1954 + }
  1955 + if (StringUtils.isNotEmpty(oralCheckId)) {
  1956 + condition = condition.and("oralCheckId", oralCheckId, MongoOper.IS);
1950 1957 }
1951 1958  
1952 1959 Criteria c = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java View file @ ae0e57d
... ... @@ -85,25 +85,31 @@
85 85 babyOralCheck.setBabyFCertNo(babyModel.getFcertNo());
86 86 }
87 87 //添加
  88 + BabyOralCheck add=new BabyOralCheck();
88 89 if (StringUtils.isEmpty(babyOralCheck.getId())) {
89 90 if (!mongoUtil.buildArchive(userid, babyOralCheck.getBabyId())) {
90 91 return RespBuilder.buildSuccess(ResponseCode.NEED_BUILD);
91 92 }
92   - babyOralCheckService.add(babyOralCheck);
  93 + add = babyOralCheckService.add(babyOralCheck);
93 94 }else {//修改
94 95 babyOralCheck.setOperaterId(userid+"");
95 96 babyOralCheck.setModified(new Date());
96 97 babyOralCheckService.update(babyOralCheck);
97 98 }
98 99  
99   - //同步数据到儿童档案(添加)
  100 + //同步数据到儿童档案
100 101 BabyOralCheckQuery checkQuery=new BabyOralCheckQuery();
101 102 checkQuery.setBabyId(babyOralCheck.getBabyId());
102 103 List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,"created");
103 104 //修改最新的记录才会同步儿童档案，新增也会同步到儿童档案
104   - if( (CollectionUtils.isNotEmpty(babyOralChecks) &&
105   - babyOralChecks.get(0).getId().equals(babyOralCheck.getId())) || StringUtils.isEmpty(babyOralCheck.getId())){
  105 + if( (CollectionUtils.isNotEmpty(babyOralChecks) && babyOralChecks.get(0).getId().equals(babyOralCheck.getId())) ||
  106 + StringUtils.isEmpty(babyOralCheck.getId())){
106 107 BabyModel babyModel2 = new BabyModel();
  108 + if(StringUtils.isEmpty(babyOralCheck.getId())){
  109 + babyModel2.setOralCheckId(add.getId());
  110 + }else{
  111 + babyModel2.setOralCheckId(babyOralCheck.getId());
  112 + }
107 113 babyModel2.setPositiveType(babyOralCheck.getPositiveType());
108 114 babyModel2.setOralCheckTime(babyOralCheck.getOralCheckTime());
109 115 babyModel2.setNextOralCheckTime(babyOralCheck.getNextOralCheckTime());
... ... @@ -120,7 +126,7 @@
120 126 BaseObjectResponse br = new BaseObjectResponse();
121 127 br.setErrorcode(ErrorCodeConstants.SUCCESS);
122 128 br.setErrormsg("成功");
123   - br.setData(babyOralCheck.getId());
  129 + br.setData(add.getId());
124 130 return br;
125 131 }
126 132  
... ... @@ -221,7 +227,7 @@
221 227 List<Map> result=new ArrayList<>();
222 228 for (BabyOralCheck babyOralCheck : babyOralChecks) {
223 229 Map<String,Object> map=ReflectionUtils.beanToMap(babyOralCheck);//对象转map
224   - map.put("sex",babyOralCheck.getBabySex()==1?"男":"女");
  230 + map.put("sex",babyOralCheck.getBabySex()!=null?(babyOralCheck.getBabySex()==1?"男":"女"):"");
225 231 map.put("oralCheckDoctor",couponMapper.getUserName(babyOralCheck.getOralCheckDoctor()));
226 232 result.add(map);
227 233 }
228 234  
... ... @@ -253,10 +259,26 @@
253 259 babyModelQuery.setBirthEnd(DateUtil.getBirthEnd(babyModelQuery.getQueryMonthAgeStart()));
254 260 }
255 261 List<BabyModel> babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "oralCheckTime", Sort.Direction.DESC);
256   -
  262 + List<Map> result=new ArrayList<>();
  263 + for (BabyModel babyModel : babyModelList) {
  264 + Map<String,Object> map=new HashMap<>();
  265 + map.put("babyId",babyModel.getId());
  266 + map.put("oralCheckId",babyModel.getOralCheckId());//最后一次检查记录id
  267 + map.put("babyName",babyModel.getName());
  268 + map.put("sex",babyModel.getSex()!=null?(babyModel.getSex()==1?"男":"女"):"");
  269 + map.put("mName",babyModel.getMname());
  270 + map.put("birth", DateUtil.getyyyy_MM_dd(babyModel.getBirth()));//出生日期
  271 + map.put("buildDate", DateUtil.getyyyy_MM_dd(babyModel.getBuildDate()));//建档日期
  272 + map.put("oralCheckDoctor",couponMapper.getUserName(babyModel.getOralCheckDoctor()));
  273 + map.put("positive", StringUtils.isNotEmpty(babyModel.getPositiveType())?("2".equals(babyModel.getPositiveType())?"阳性":"正常"):"");//阳性项目
  274 + map.put("checkTime", DateUtil.getYyyyMmDd(babyModel.getOralCheckTime()));//检查日期
  275 + map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyModel.getNextOralCheckTime()));//预约日期
  276 + map.put("checkId", babyModel.getCheckId());//儿童眼保健检查id
  277 + result.add(map);
  278 + }
257 279 BaseObjectResponse br = new BaseObjectResponse();
258 280 br.setErrorcode(ErrorCodeConstants.SUCCESS);
259   - br.setData(babyModelList);
  281 + br.setData(result);
260 282 br.setPageInfo(babyModelQuery.getPageInfo());
261 283 br.setErrormsg("成功");
262 284 return br;