jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 09c90ce8c332a7721814248985fc1e2fb50ff4d5

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

update

Showing 3 changed files with 83 additions and 41 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java View file @ 09c90ce
... ... @@ -185,10 +185,12 @@
185 185 @TokenRequired
186 186 @RequestMapping(method = RequestMethod.GET)
187 187 public BaseResponse list(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request,
188   - Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds,Integer classify) {
  188 + Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds,Integer classify,
  189 + String babySource,Integer healthCheckType,String healthCheckTypeScattered,Integer healthCheckTypeWhole,Integer kindergarten,Integer basicOrganization) {
189 190 return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key,yeymcId,
190 191 currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit,
191   - bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, noPassIds,classify);
  192 + bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, noPassIds,classify,
  193 + babySource,healthCheckType,healthCheckTypeScattered,healthCheckTypeWhole,kindergarten,basicOrganization);
192 194 }
193 195  
194 196 /**
... ... @@ -209,8 +211,10 @@
209 211 @ResponseBody
210 212 @TokenRequired
211 213 @RequestMapping(value = "/export", method = RequestMethod.GET)
212   - public void export(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin, Integer classify) {
213   - babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, yeymcId,currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, classify);
  214 + public void export(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin, Integer classify,
  215 + String babySource,Integer healthCheckType,String healthCheckTypeScattered,Integer healthCheckTypeWhole,Integer kindergarten,Integer basicOrganization) {
  216 + babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, yeymcId,currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, classify,
  217 + babySource,healthCheckType,healthCheckTypeScattered,healthCheckTypeWhole,kindergarten,basicOrganization);
214 218 }
215 219  
216 220 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java View file @ 09c90ce
... ... @@ -30,7 +30,8 @@
30 30 BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,
31 31 Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive,
32 32 String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate, String apparatusPositive,
33   - String doctorPositive, String yin, String noPassIds, Integer classify);
  33 + String doctorPositive, String yin, String noPassIds, Integer classify,
  34 + String babySource,Integer healthCheckType,String healthCheckTypeScattered,Integer healthCheckTypeWhole,Integer kindergarten,Integer basicOrganization);
34 35  
35 36 BaseResponse childrenFilingList(Integer userId, Date startBuildDate, Date endBuildDate,Date startDate, Date endDate, String doctor, String key,
36 37 Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive,
... ... @@ -45,7 +46,8 @@
45 46  
46 47 BaseResponse listInit(Integer userId);
47 48  
48   - void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,Integer classify);
  49 + void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,Integer classify,
  50 + String babySource,Integer healthCheckType,String healthCheckTypeScattered,Integer healthCheckTypeWhole,Integer kindergarten,Integer basicOrganization);
49 51  
50 52 BaseResponse getBabyEyeCheckInfo(String hospitalId, String babyId);
51 53 public String getExcItems(BabyNerveMovementModel movementModel);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 09c90ce
... ... @@ -269,6 +269,25 @@
269 269 babyEyeCheck.setApparatus("1");
270 270 }
271 271  
  272 + //该儿童来源修改后需同步更新该儿童的所有检查纪录来源
  273 + Update update2 = null;
  274 + if(StringUtils.isNotEmpty(babyEyeCheck.getBabySource())||
  275 + null!=babyEyeCheck.getHealthCheckType()||
  276 + StringUtils.isNotEmpty(babyEyeCheck.getHealthCheckTypeScattered())||
  277 + null!=babyEyeCheck.getHealthCheckTypeWhole()||
  278 + null!=babyEyeCheck.getKindergarten()||
  279 + null!=babyEyeCheck.getBasicOrganization()
  280 + ){
  281 + Map<String,Object> map=new HashMap<>();
  282 + map.put("babySource", StringUtils.isNotEmpty(babyEyeCheck.getBabySource())?babyEyeCheck.getBabySource():"");
  283 + map.put("healthCheckType", null!=babyEyeCheck.getHealthCheckType()?babyEyeCheck.getHealthCheckType():0);
  284 + map.put("healthCheckTypeScattered", StringUtils.isNotEmpty(babyEyeCheck.getHealthCheckTypeScattered())?babyEyeCheck.getHealthCheckTypeScattered():"");
  285 + map.put("healthCheckTypeWhole", null!=babyEyeCheck.getHealthCheckTypeWhole()?babyEyeCheck.getHealthCheckTypeWhole():0);
  286 + map.put("kindergarten", null!=babyEyeCheck.getKindergarten()?babyEyeCheck.getKindergarten():0);
  287 + map.put("basicOrganization", null!=babyEyeCheck.getBasicOrganization()?babyEyeCheck.getBasicOrganization():0);
  288 + update2=MongoConvertHelper.convertToNativeUpdate(map);
  289 + }
  290 +
272 291 //添加眼保健
273 292 if (StringUtils.isEmpty(babyEyeCheck.getId())) {
274 293 if (!mongoUtil.buildArchive(userId, babyEyeCheck.getBabyId())) {
... ... @@ -287,6 +306,11 @@
287 306 mongoTemplate.save(babyEyeCheck);
288 307 redundancyBabyCheck(babyEyeCheck, babyModel, "ADD");
289 308  
  309 + //新增时同步更新来源信息
  310 + if(null!=update2){
  311 + mongoTemplate.updateMulti(Query.query(Criteria.where("babyId").is(babyEyeCheck.getBabyId())), update2, BabyEyeCheck.class);
  312 + }
  313 +
290 314 // 添加追访眼保检查
291 315 Date nextCheckTime = babyEyeCheck.getNextCheckTime();
292 316 if (null != nextCheckTime) {
293 317  
... ... @@ -309,31 +333,16 @@
309 333  
310 334 Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyEyeCheck));
311 335 mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyEyeCheck.getId())), update, BabyEyeCheck.class);
312   -
313   - //该儿童来源修改后需同步更新该儿童的所有检查纪录来源
314   - if(StringUtils.isNotEmpty(babyEyeCheck.getBabySource())||
315   - null!=babyEyeCheck.getHealthCheckType()||
316   - StringUtils.isNotEmpty(babyEyeCheck.getHealthCheckTypeScattered())||
317   - null!=babyEyeCheck.getHealthCheckTypeWhole()||
318   - null!=babyEyeCheck.getKindergarten()||
319   - null!=babyEyeCheck.getBasicOrganization()
320   - ){
321   - Map<String,Object> map=new HashMap<>();
322   - map.put("babySource", StringUtils.isNotEmpty(babyEyeCheck.getBabySource())?babyEyeCheck.getBabySource():null);
323   - map.put("healthCheckType", null!=babyEyeCheck.getHealthCheckType()?babyEyeCheck.getHealthCheckType():null);
324   - map.put("healthCheckTypeScattered", StringUtils.isNotEmpty(babyEyeCheck.getHealthCheckTypeScattered())?babyEyeCheck.getHealthCheckTypeScattered():null);
325   - map.put("healthCheckTypeWhole", null!=babyEyeCheck.getHealthCheckTypeWhole()?babyEyeCheck.getHealthCheckTypeWhole():null);
326   - map.put("kindergarten", null!=babyEyeCheck.getKindergarten()?babyEyeCheck.getKindergarten():null);
327   - map.put("basicOrganization", null!=babyEyeCheck.getBasicOrganization()?babyEyeCheck.getBasicOrganization():null);
328   - Update update2=MongoConvertHelper.convertToNativeUpdate(map);
329   - mongoTemplate.updateFirst(Query.query(Criteria.where("babyId").is(babyEyeCheck.getBabyId())), update2, BabyEyeCheck.class);
330   - }
331   -
332 336 BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class);
333 337 if (babyModel != null) {
334 338 redundancyBabyCheck(babyEyeCheck, babyModel, "UPDATE");
335 339 }
336 340  
  341 + //更新时同步更新来源信息
  342 + if(null!=update2){
  343 + mongoTemplate.updateMulti(Query.query(Criteria.where("babyId").is(babyEyeCheck.getBabyId())), update2, BabyEyeCheck.class);
  344 + }
  345 +
337 346 syncData("UPDATE", babyEyeCheck, babyEyeCheck.getId());
338 347 //添加修改的操作日志记录
339 348 List<BabyEyeCheck> after = mongoTemplate.find(Query.query(Criteria.where("id").is(babyEyeCheck.getId())), BabyEyeCheck.class);
340 349  
341 350  
342 351  
343 352  
344 353  
345 354  
... ... @@ -463,21 +472,21 @@
463 472 babyModel.setRefraction2(StringUtils.isEmpty(babyEyeCheck.getRefraction2()) ? "" : babyEyeCheck.getRefraction2());
464 473  
465 474 //秦皇岛-儿保眼科-分类-1.近视高危、2.弱视高危、3.异常高危
466   - babyModel.setClassify(null==babyEyeCheck.getClassify()?null:babyEyeCheck.getClassify());
  475 + babyModel.setClassify(null==babyEyeCheck.getClassify()?0:babyEyeCheck.getClassify());
467 476  
468 477 //儿童眼保健检查-新增页面 检查套餐上面加“来源”这四类可以多选。
469 478 //来源多选 1：健康查体 2：幼儿园转诊 3:基层转诊 4：本院
470   - babyModel.setBabySource(StringUtils.isEmpty(babyEyeCheck.getBabySource())?null:babyEyeCheck.getBabySource());
  479 + babyModel.setBabySource(StringUtils.isEmpty(babyEyeCheck.getBabySource())?"":babyEyeCheck.getBabySource());
471 480 //1：健康查体: 1：散居、2:整体
472   - babyModel.setHealthCheckType(null==babyEyeCheck.getHealthCheckType()?null:babyEyeCheck.getHealthCheckType());
  481 + babyModel.setHealthCheckType(null==babyEyeCheck.getHealthCheckType()?0:babyEyeCheck.getHealthCheckType());
473 482 //1:散居（手输）
474   - babyModel.setHealthCheckTypeScattered(StringUtils.isEmpty(babyEyeCheck.getHealthCheckTypeScattered())?null:babyEyeCheck.getHealthCheckTypeScattered());
  483 + babyModel.setHealthCheckTypeScattered(StringUtils.isEmpty(babyEyeCheck.getHealthCheckTypeScattered())?"":babyEyeCheck.getHealthCheckTypeScattered());
475 484 //2:整体
476   - babyModel.setHealthCheckTypeWhole( null==babyEyeCheck.getHealthCheckTypeWhole()?null:babyEyeCheck.getHealthCheckTypeWhole());
  485 + babyModel.setHealthCheckTypeWhole( null==babyEyeCheck.getHealthCheckTypeWhole()?0:babyEyeCheck.getHealthCheckTypeWhole());
477 486 //2：幼儿园转诊--幼儿园机构
478   - babyModel.setKindergarten(null== babyEyeCheck.getKindergarten()?null:babyEyeCheck.getKindergarten());
  487 + babyModel.setKindergarten(null== babyEyeCheck.getKindergarten()?0:babyEyeCheck.getKindergarten());
479 488 //3:基层转诊--基层机构
480   - babyModel.setBasicOrganization(null== babyEyeCheck.getBasicOrganization()?null:babyEyeCheck.getBasicOrganization());
  489 + babyModel.setBasicOrganization(null== babyEyeCheck.getBasicOrganization()?0:babyEyeCheck.getBasicOrganization());
481 490  
482 491 Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyModel));
483 492 mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyModel.getId())), update, BabyModel.class);
... ... @@ -987,7 +996,8 @@
987 996 public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart,
988 997 Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds,
989 998 Integer page, Integer limit, Date bookStartDate, Date bookEndDate,
990   - String apparatusPositive, String doctorPositive, String yin, String noPassIds, Integer classify) {
  999 + String apparatusPositive, String doctorPositive, String yin, String noPassIds, Integer classify,
  1000 + String babySource,Integer healthCheckType,String healthCheckTypeScattered,Integer healthCheckTypeWhole,Integer kindergarten,Integer basicOrganization) {
991 1001 boolean b = true;
992 1002 String hospitalId = autoMatchFacade.getHospitalId(userId);
993 1003 Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
994 1004  
... ... @@ -1030,10 +1040,29 @@
1030 1040 if (StringUtils.isNotEmpty(yin)) {
1031 1041 criteria.and("apparatus").nin("2").and("doctorJudgement").nin("2");
1032 1042 }
1033   - //分类-1.近视高危、2.弱视高危、3.异常高危。 （筛选查询）
  1043 + //秦皇岛-分类-1.近视高危、2.弱视高危、3.异常高危。 （筛选查询）
1034 1044 if (null!=classify) {
1035 1045 criteria.and("classify").is(classify);
1036 1046 }
  1047 + //秦皇岛-来源模块
  1048 + if(StringUtils.isNotEmpty(babySource)){
  1049 + criteria.and("babySource").is(babySource);
  1050 + }
  1051 + if(null!=healthCheckType){
  1052 + criteria.and("healthCheckType").is(healthCheckType);
  1053 + }
  1054 + if(StringUtils.isNotEmpty(healthCheckTypeScattered)){
  1055 + criteria.and("healthCheckTypeScattered").is(healthCheckTypeScattered);
  1056 + }
  1057 + if(null!=healthCheckTypeWhole){
  1058 + criteria.and("healthCheckTypeWhole").is(healthCheckTypeWhole);
  1059 + }
  1060 + if(null!=kindergarten){
  1061 + criteria.and("kindergarten").is(kindergarten);
  1062 + }
  1063 + if(null!=basicOrganization){
  1064 + criteria.and("basicOrganization").is(basicOrganization);
  1065 + }
1037 1066  
1038 1067 if (org.apache.commons.lang.StringUtils.isNotBlank(key) || org.apache.commons.lang.StringUtils.isNotBlank(yeymcId)) {
1039 1068 Criteria c = new Criteria();
... ... @@ -1083,7 +1112,6 @@
1083 1112 Query query = new Query(criteria);
1084 1113 query.with(new Sort(Sort.Direction.DESC, "created"));
1085 1114 query.addCriteria(new Criteria().orOperator(Criteria.where("apparatus").is("2"), Criteria.where("doctorJudgement").is("2")));
1086   - System.out.println(query.toString());
1087 1115  
1088 1116 int count = (int) mongoTemplate.count(query, BabyEyeCheck.class);
1089 1117  
... ... @@ -1092,7 +1120,6 @@
1092 1120 param.setLimit(limit);
1093 1121 param.mysqlBuild(count);
1094 1122 query.skip(param.getOffset()).limit(param.getLimit());
1095   -
1096 1123 List<BabyEyeCheck> babyEyeChecks = mongoTemplate.find(query, BabyEyeCheck.class);
1097 1124 // doFilter(babyEyeChecks);
1098 1125  
... ... @@ -1365,8 +1392,15 @@
1365 1392 temp.put("doctor", couponMapper.getUserName(babyEyeCheck.getDoctor()));
1366 1393 temp.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime()));
1367 1394 temp.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime()));
1368   - //分类-1.近视高危、2.弱视高危、3.异常高危
1369   - temp.put("classify", babyEyeCheck.getClassify());
  1395 + //秦皇岛-分类-1.近视高危、2.弱视高危、3.异常高危
  1396 + temp.put("classify", null!=babyEyeCheck.getClassify()?babyEyeCheck.getClassify():0);
  1397 + //秦皇岛-来源模块
  1398 + temp.put("babySource", StringUtils.isNotEmpty(babyEyeCheck.getBabySource())?babyEyeCheck.getBabySource():"");
  1399 + temp.put("healthCheckType", null!=babyEyeCheck.getHealthCheckType()?babyEyeCheck.getHealthCheckType():0);
  1400 + temp.put("healthCheckTypeScattered", StringUtils.isNotEmpty(babyEyeCheck.getHealthCheckTypeScattered())?babyEyeCheck.getHealthCheckTypeScattered():"");
  1401 + temp.put("healthCheckTypeWhole", null!=babyEyeCheck.getHealthCheckTypeWhole()?babyEyeCheck.getHealthCheckTypeWhole():0);
  1402 + temp.put("kindergarten", null!=babyEyeCheck.getKindergarten()?babyEyeCheck.getKindergarten():0);
  1403 + temp.put("basicOrganization", null!=babyEyeCheck.getBasicOrganization()?babyEyeCheck.getBasicOrganization():0);
1370 1404 CollectionUtils.removeNullValue(temp);
1371 1405 restMap.add(temp);
1372 1406 }
... ... @@ -2207,8 +2241,10 @@
2207 2241 }
2208 2242  
2209 2243 @Override
2210   - public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin, Integer classify) {
2211   - BaseResponse rest = list(userId, startDate, endDate, doctor, key, yeymcId, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, null, classify);
  2244 + public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin, Integer classify,
  2245 + String babySource,Integer healthCheckType,String healthCheckTypeScattered,Integer healthCheckTypeWhole,Integer kindergarten,Integer basicOrganization) {
  2246 + BaseResponse rest = list(userId, startDate, endDate, doctor, key, yeymcId, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, null, classify,
  2247 + babySource,healthCheckType,healthCheckTypeScattered,healthCheckTypeWhole,kindergarten,basicOrganization);
2212 2248 PageResult pageResult = (PageResult) rest.getObject();
2213 2249 List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
2214 2250 Map<String, String> cnames = new LinkedHashMap<>();