Commit 03ab5d0d26ed4f0a79a99d389266b99426986b00
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 13 changed files
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java
- platform-sync-data/platform-sync-data.iml
- regional-etl/regional-etl.iml
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
View file @
03ab5d0
| ... | ... | @@ -327,7 +327,13 @@ |
| 327 | 327 | restMap.put("vcCardNo", baby.getVcCardNo()); /** 就诊卡号 */ |
| 328 | 328 | // restMap.put("cardNo", baby.getCardNo()); /** 证件号 */ |
| 329 | 329 | restMap.put("cardNo", person.getCardNo()); /** 证件号 */ |
| 330 | - restMap.put("pcerteTypeId", baby.getFcertTypeId()); /** 证件类型id */ | |
| 330 | + | |
| 331 | + List<Patients> list = mongoTemplate.find(Query.query(Criteria.where("cardNo").is(person.getCardNo())).with(new Sort(Sort.Direction.DESC, "created")), Patients.class); | |
| 332 | + if(CollectionUtils.isNotEmpty(list)) { | |
| 333 | + restMap.put("pcerteTypeId", list.get(0).getPcerteTypeId()); /** 证件类型id */ | |
| 334 | + } else { | |
| 335 | + restMap.put("pcerteTypeId", "57e1dd12f0f02e7ca519d6c7"); /** 其他*/ | |
| 336 | + } | |
| 331 | 337 | } else { |
| 332 | 338 | Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class); |
| 333 | 339 | if(patients != null) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
View file @
03ab5d0
| ... | ... | @@ -4,6 +4,8 @@ |
| 4 | 4 | import com.lyms.platform.common.base.BaseController; |
| 5 | 5 | import com.lyms.platform.common.base.LoginContext; |
| 6 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 7 | +import com.lyms.platform.common.enums.ServiceStatusEnums; | |
| 8 | +import com.lyms.platform.common.enums.ServiceTypeEnums; | |
| 7 | 9 | import com.lyms.platform.common.result.BaseListResponse; |
| 8 | 10 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 9 | 11 | import com.lyms.platform.common.result.BaseResponse; |
| 10 | 12 | |
| ... | ... | @@ -165,7 +167,13 @@ |
| 165 | 167 | list.add(i); |
| 166 | 168 | } |
| 167 | 169 | |
| 170 | + //服务类型 | |
| 171 | + List serviceType = ServiceTypeEnums.getServiceTypeList(); | |
| 172 | + map.put("serviceType", serviceType); | |
| 168 | 173 | |
| 174 | + //服务状态 | |
| 175 | + List serviceStatus = ServiceStatusEnums.getServiceStatusList(); | |
| 176 | + map.put("serviceStatus", serviceStatus); | |
| 169 | 177 | |
| 170 | 178 | map.put("score", list); |
| 171 | 179 | map.put("organizations", antenatalExaminationFacade.convert()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
03ab5d0
| ... | ... | @@ -427,12 +427,12 @@ |
| 427 | 427 | Map olevel = new HashMap(); |
| 428 | 428 | if (StringUtils.isNotEmpty(record.getfId())) { |
| 429 | 429 | String risk = null; |
| 430 | - if (record.getType() == 1) { | |
| 430 | + if (record.getType() == 2) { | |
| 431 | 431 | AntExChuModel model = antExService.findOne(record.getfId()); |
| 432 | 432 | if (null != model) { |
| 433 | 433 | risk = model.getOtherHighRisk(); |
| 434 | 434 | } |
| 435 | - } else if (record.getType() == 2) { | |
| 435 | + } else if (record.getType() == 1) { | |
| 436 | 436 | AntenatalExaminationModel model = antExService.findOneById(record.getfId()); |
| 437 | 437 | if (null != model) { |
| 438 | 438 | risk = model.getOtherRisk(); |
| 439 | 439 | |
| ... | ... | @@ -602,11 +602,12 @@ |
| 602 | 602 | BaseListResponse listRep = (BaseListResponse) findList(antExManagerQueryRequest, id, b, null); |
| 603 | 603 | List<Map<String, Object>> datas = new ArrayList<>(); |
| 604 | 604 | try { |
| 605 | - Map<String, Object> data = new HashMap<>(); | |
| 605 | + | |
| 606 | 606 | if (listRep != null) { |
| 607 | 607 | List<AntExManagerResult> list = listRep.getData(); |
| 608 | 608 | if (CollectionUtils.isNotEmpty(list)) { |
| 609 | 609 | for (AntExManagerResult aer : list) { |
| 610 | + Map<String, Object> data = new HashMap<>(); | |
| 610 | 611 | data.put("checkTime", aer.getCheckTime()); |
| 611 | 612 | data.put("name", aer.getName()); |
| 612 | 613 | data.put("age", aer.getAge()); |
| ... | ... | @@ -614,7 +615,8 @@ |
| 614 | 615 | data.put("rLevel", getLevel(aer.getrLevel())); |
| 615 | 616 | data.put("riskFactor", aer.getRiskFactor()); |
| 616 | 617 | data.put("riskScore", aer.getRiskScore()); |
| 617 | - data.put("cTimes", aer.getcTimes()); | |
| 618 | + data.put("chTimes", aer.getChTimes()); | |
| 619 | + data.put("tTimes", aer.gettTimes()); | |
| 618 | 620 | data.put("dueDate", aer.getDueDate()); |
| 619 | 621 | data.put("addr", aer.getAddr()); |
| 620 | 622 | data.put("checkHospital", aer.getCheckHospital()); |
| ... | ... | @@ -632,7 +634,8 @@ |
| 632 | 634 | cnames.put("rLevel", "高危等级"); |
| 633 | 635 | cnames.put("riskFactor", "高危因素"); |
| 634 | 636 | cnames.put("riskScore", "高危评分"); |
| 635 | - cnames.put("cTimes", "产检第次"); | |
| 637 | + cnames.put("chTimes", "本院产检第次"); | |
| 638 | + cnames.put("tTimes", "总产检第次"); | |
| 636 | 639 | cnames.put("dueDate", "预产期"); |
| 637 | 640 | cnames.put("addr", "居住地"); |
| 638 | 641 | cnames.put("checkHospital", "产检医院"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
03ab5d0
| ... | ... | @@ -282,7 +282,7 @@ |
| 282 | 282 | |
| 283 | 283 | // 修改关联券的使用状态,如果已使用,则返回错误码 |
| 284 | 284 | //初诊只能建一次 |
| 285 | - if (StringUtils.isNotBlank(model.getBarCode())) { | |
| 285 | + /* if (StringUtils.isNotBlank(model.getBarCode())) { | |
| 286 | 286 | PatientCheckTicketQuery checkTicketQuery = new PatientCheckTicketQuery(); |
| 287 | 287 | checkTicketQuery.setPid(model.getPid()); |
| 288 | 288 | checkTicketQuery.setId(model.getBarCode()); |
| ... | ... | @@ -295,7 +295,7 @@ |
| 295 | 295 | } else { |
| 296 | 296 | return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该产检劵不属于本人"); |
| 297 | 297 | } |
| 298 | - } | |
| 298 | + }*/ | |
| 299 | 299 | Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); |
| 300 | 300 | patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); |
| 301 | 301 | |
| ... | ... | @@ -393,7 +393,7 @@ |
| 393 | 393 | * @param excAddRequest |
| 394 | 394 | * @return |
| 395 | 395 | */ |
| 396 | - public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest, Integer userId) { | |
| 396 | + public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest, Integer userId) { | |
| 397 | 397 | StopWatch stopWatch =new StopWatch("addOneAnetExChu"); |
| 398 | 398 | |
| 399 | 399 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| ... | ... | @@ -461,7 +461,7 @@ |
| 461 | 461 | |
| 462 | 462 | //初诊只能建一次 |
| 463 | 463 | // 修改关联券的使用状态,如果已使用,则返回错误码 |
| 464 | - if (StringUtils.isNotBlank(antExChuModel.getBarCode())) { | |
| 464 | + /* if (StringUtils.isNotBlank(antExChuModel.getBarCode())) { | |
| 465 | 465 | PatientCheckTicketQuery checkTicketQuery = new PatientCheckTicketQuery(); |
| 466 | 466 | checkTicketQuery.setPid(antExChuModel.getPid()); |
| 467 | 467 | checkTicketQuery.setId(antExChuModel.getBarCode()); |
| ... | ... | @@ -474,7 +474,7 @@ |
| 474 | 474 | } else { |
| 475 | 475 | return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该产检劵不属于本人"); |
| 476 | 476 | } |
| 477 | - } | |
| 477 | + }*/ | |
| 478 | 478 | if (CollectionUtils.isEmpty(data1)) { |
| 479 | 479 | Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); |
| 480 | 480 | PatientsQuery patientsQuery = new PatientsQuery(); |
| ... | ... | @@ -2219,9 +2219,9 @@ |
| 2219 | 2219 | } |
| 2220 | 2220 | } |
| 2221 | 2221 | AntExChuQuery antExChuQuery =new AntExChuQuery(); |
| 2222 | - antExQuery1.setHospitalId(hospitalId); | |
| 2223 | - antExQuery1.setParentId(parentId); | |
| 2224 | - antExQuery1.setYn(YnEnums.YES.getId()); | |
| 2222 | + antExChuQuery.setHospitalId(hospitalId); | |
| 2223 | + antExChuQuery.setParentId(parentId); | |
| 2224 | + antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 2225 | 2225 | List<AntExChuModel> chuModelList= antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 2226 | 2226 | if(CollectionUtils.isNotEmpty(chuModelList)){ |
| 2227 | 2227 | for(AntExChuModel chu:chuModelList){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
View file @
03ab5d0
| ... | ... | @@ -258,6 +258,7 @@ |
| 258 | 258 | // 查询母亲信息 |
| 259 | 259 | DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); |
| 260 | 260 | dischargeAbstractMotherQuery.setPatientId(patients.getId()); |
| 261 | + dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId()); | |
| 261 | 262 | List<DischargeAbstractMotherModel> dischargeAbstractMotherModelList = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery); |
| 262 | 263 | |
| 263 | 264 | if (dischargeAbstractMotherModelList == null || dischargeAbstractMotherModelList.size() == 0) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
View file @
03ab5d0
| ... | ... | @@ -423,14 +423,15 @@ |
| 423 | 423 | parentIds.add(pa.getId()); |
| 424 | 424 | } |
| 425 | 425 | folicAcidQuery.setParentIds(parentIds); |
| 426 | - }else{//没有数据 | |
| 427 | - BaseListResponse baseListResponse = new BaseListResponse(); | |
| 428 | - baseListResponse.setErrormsg("成功"); | |
| 429 | - baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
| 430 | - baseListResponse.setData(list); | |
| 431 | - baseListResponse.setPageInfo(folicAcidQuery.getPageInfo()); | |
| 432 | - return baseListResponse; | |
| 433 | 426 | } |
| 427 | +// else{//没有数据 | |
| 428 | +// BaseListResponse baseListResponse = new BaseListResponse(); | |
| 429 | +// baseListResponse.setErrormsg("成功"); | |
| 430 | +// baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
| 431 | +// baseListResponse.setData(list); | |
| 432 | +// baseListResponse.setPageInfo(folicAcidQuery.getPageInfo()); | |
| 433 | +// return baseListResponse; | |
| 434 | +// } | |
| 434 | 435 | |
| 435 | 436 | List<FolicAcid> folicAcidList = folicAcidService.queryFolicAcid(folicAcidQuery); |
| 436 | 437 | if (CollectionUtils.isNotEmpty(folicAcidList)){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
03ab5d0
| ... | ... | @@ -83,18 +83,8 @@ |
| 83 | 83 | } |
| 84 | 84 | //result.addAll(queryPacsCheckList(cardNo)); |
| 85 | 85 | List<String> keyList = new ArrayList<>(); |
| 86 | - // 去重 | |
| 87 | - List<CheckResponse> list = new ArrayList<>(); | |
| 88 | - Date tempDate = null; | |
| 89 | - for (CheckResponse check:result) { | |
| 90 | - if (check.getModified() != null && check.getModified().equals(tempDate)) { | |
| 91 | - continue; | |
| 92 | - } | |
| 93 | - list.add(check); | |
| 94 | - tempDate = check.getModified(); | |
| 95 | - } | |
| 96 | 86 | // 排序 |
| 97 | - Collections.sort(list, new Comparator() { | |
| 87 | + Collections.sort(result, new Comparator() { | |
| 98 | 88 | public int compare(Object a, Object b) { |
| 99 | 89 | if (((CheckResponse)a).getApplyDate() == null) { |
| 100 | 90 | return -1; |
| 101 | 91 | |
| ... | ... | @@ -102,15 +92,15 @@ |
| 102 | 92 | if (((CheckResponse)b).getApplyDate() == null) { |
| 103 | 93 | return -1; |
| 104 | 94 | } |
| 105 | - if (((CheckResponse)a).getApplyDate().before(((CheckResponse)a).getApplyDate())) { | |
| 95 | + if (((CheckResponse)a).getApplyDate().before(((CheckResponse)b).getApplyDate())) { | |
| 106 | 96 | return 1; |
| 107 | 97 | } |
| 108 | 98 | return -1; |
| 109 | 99 | } |
| 110 | 100 | }); |
| 111 | 101 | |
| 112 | - for (CheckResponse check:list) { | |
| 113 | - Date date = check.getModified() == null ? check.getApplyDate() : check.getModified(); | |
| 102 | + for (CheckResponse check:result) { | |
| 103 | + Date date = check.getApplyDate() == null ? check.getModified() : check.getApplyDate(); | |
| 114 | 104 | String ymd = DateUtil.getyyyy_MM_dd(date); |
| 115 | 105 | if (!keyList.contains(ymd)) { |
| 116 | 106 | keyList.add(ymd); |
| ... | ... | @@ -238,7 +228,7 @@ |
| 238 | 228 | //CheckType1.setType(typ); |
| 239 | 229 | for(CheckResponse chre:result){ |
| 240 | 230 | if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){ |
| 241 | - chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getApplyDate())+" "+chre.getTitle()); | |
| 231 | + chre.setTitle(chre.getTitle()+" "+DateUtil.getyyyy_MM_dd(chre.getApplyDate())); | |
| 242 | 232 | result2.add(chre); |
| 243 | 233 | } |
| 244 | 234 | |
| 245 | 235 | |
| ... | ... | @@ -442,14 +432,14 @@ |
| 442 | 432 | { |
| 443 | 433 | if (lis != null && reportModel != null) |
| 444 | 434 | { |
| 445 | - if (StringUtils.isNotEmpty(lis.getLisId()) && !lis.getLisId().equals(reportModel.getLisId())) | |
| 435 | + if (StringUtils.isNotEmpty(lis.getLisId()) && lis.getLisId().equals(reportModel.getLisId()) && lis.getTitle().equals(reportModel.getTitle())) | |
| 446 | 436 | { |
| 447 | 437 | isExist = true; |
| 448 | 438 | break; |
| 449 | 439 | } |
| 450 | 440 | } |
| 451 | 441 | } |
| 452 | - if (isExist) | |
| 442 | + if (!isExist) | |
| 453 | 443 | { |
| 454 | 444 | noExists.add(lis); |
| 455 | 445 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
03ab5d0
| ... | ... | @@ -1208,7 +1208,7 @@ |
| 1208 | 1208 | |
| 1209 | 1209 | cnames.put("jianChaJieGuo", "检查结果"); |
| 1210 | 1210 | cnames.put("jianChaDetails", "检查异常详情"); |
| 1211 | - cnames.put("jiBingZhenDuan", "jiBingZhenDuan"); | |
| 1211 | + cnames.put("jiBingZhenDuan", "疾病诊断"); | |
| 1212 | 1212 | |
| 1213 | 1213 | cnames.put("yiXueYiJian", "医学意见"); |
| 1214 | 1214 | cnames.put("yiJianQiTaDetails", "医学意见其他详情"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
03ab5d0
| ... | ... | @@ -951,6 +951,14 @@ |
| 951 | 951 | //下次检查孕周 |
| 952 | 952 | map.put("nextCheckWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getNextCheckTime())); |
| 953 | 953 | /* 初诊信息 */ |
| 954 | + | |
| 955 | + | |
| 956 | + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检测":"未检测"); | |
| 957 | + map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检测":"未检测"); | |
| 958 | + map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检测":"未检测"); | |
| 959 | + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检测":"未检测"); | |
| 960 | + map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检测":"未检测"); | |
| 961 | + map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检测":"未检测"); | |
| 954 | 962 | //既往史 |
| 955 | 963 | String pastHistory = ""; |
| 956 | 964 | if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPastHistory())) { |
| 957 | 965 | |
| 958 | 966 | |
| 959 | 967 | |
| 960 | 968 | |
| 961 | 969 | |
| ... | ... | @@ -1028,22 +1036,34 @@ |
| 1028 | 1036 | map.put("gongwaiyun", UnitUtils.unitSplice(data.getGongwaiyun(), UnitConstants.CI)); |
| 1029 | 1037 | //流产 |
| 1030 | 1038 | StringBuffer abortion = new StringBuffer(); |
| 1031 | - abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI)); | |
| 1032 | - abortion.append("("); | |
| 1039 | + if (data.getAbortion() != null) | |
| 1040 | + { | |
| 1041 | + boolean isAppend = false; | |
| 1042 | + abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI)); | |
| 1043 | + if (data.getAbortionZR() != null || data.getAbortionRG() != null || data.getYaowu() != null) | |
| 1044 | + { | |
| 1045 | + isAppend = true; | |
| 1046 | + abortion.append("("); | |
| 1047 | + } | |
| 1048 | + if (data.getAbortionZR() != null) { | |
| 1049 | + abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI); | |
| 1050 | + } | |
| 1033 | 1051 | |
| 1034 | - if (data.getAbortionZR() != null) { | |
| 1035 | - abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI); | |
| 1036 | - } | |
| 1052 | + if (data.getAbortionRG() != null) { | |
| 1053 | + abortion.append(" 人工:" + data.getAbortionRG() + UnitConstants.CI + ""); | |
| 1054 | + } | |
| 1037 | 1055 | |
| 1038 | - if (data.getAbortionRG() != null) { | |
| 1039 | - abortion.append(" 人工:" + data.getAbortionRG() + UnitConstants.CI + ""); | |
| 1040 | - } | |
| 1056 | + if (data.getYaowu() != null) { | |
| 1057 | + abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + ""); | |
| 1058 | + } | |
| 1059 | + if (isAppend) | |
| 1060 | + { | |
| 1061 | + abortion.append(")"); | |
| 1062 | + } | |
| 1041 | 1063 | |
| 1042 | - if (data.getYaowu() != null) { | |
| 1043 | - abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + ""); | |
| 1044 | 1064 | } |
| 1045 | - abortion.append(")"); | |
| 1046 | 1065 | |
| 1066 | + | |
| 1047 | 1067 | map.put("abortion", abortion); |
| 1048 | 1068 | /*map.put("abortion", UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + " (自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" + |
| 1049 | 1069 | data.getAbortionRG() + UnitConstants.CI);*/ |
| ... | ... | @@ -1383,6 +1403,26 @@ |
| 1383 | 1403 | //产检基本信息 |
| 1384 | 1404 | map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate())); |
| 1385 | 1405 | map.put("currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate())); |
| 1406 | + | |
| 1407 | + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检测":"未检测"); | |
| 1408 | + map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检测":"未检测"); | |
| 1409 | + map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检测":"未检测"); | |
| 1410 | + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检测":"未检测"); | |
| 1411 | + map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检测":"未检测"); | |
| 1412 | + map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检测":"未检测"); | |
| 1413 | + | |
| 1414 | + //早孕期病毒检测 | |
| 1415 | +// private String zyqbdjc; | |
| 1416 | + //nt检查 | |
| 1417 | +// private String ntjc; | |
| 1418 | + //产前筛查 | |
| 1419 | +// private String cjsc; | |
| 1420 | + //胎儿系统排畸b吵 | |
| 1421 | +// private String textpjbc; | |
| 1422 | + //75gODTT | |
| 1423 | +// private String s75gdgtt; | |
| 1424 | + //甲状腺功能 | |
| 1425 | +// private String jzxgn; | |
| 1386 | 1426 | |
| 1387 | 1427 | String checkDoctor = ""; |
| 1388 | 1428 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
View file @
03ab5d0
| ... | ... | @@ -463,7 +463,7 @@ |
| 463 | 463 | //阴道检测 |
| 464 | 464 | private String ydjc; |
| 465 | 465 | //羊水指数 |
| 466 | - private Integer yszs; | |
| 466 | + private Double yszs; | |
| 467 | 467 | |
| 468 | 468 | public Double getHeartRate() { |
| 469 | 469 | return heartRate; |
| 470 | 470 | |
| ... | ... | @@ -569,11 +569,11 @@ |
| 569 | 569 | this.ydjc = ydjc; |
| 570 | 570 | } |
| 571 | 571 | |
| 572 | - public Integer getYszs() { | |
| 572 | + public Double getYszs() { | |
| 573 | 573 | return yszs; |
| 574 | 574 | } |
| 575 | 575 | |
| 576 | - public void setYszs(Integer yszs) { | |
| 576 | + public void setYszs(Double yszs) { | |
| 577 | 577 | this.yszs = yszs; |
| 578 | 578 | } |
| 579 | 579 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java
View file @
03ab5d0
| ... | ... | @@ -129,12 +129,12 @@ |
| 129 | 129 | String fxys = ""; |
| 130 | 130 | if (StringUtils.isNotEmpty(e.getfId())) { |
| 131 | 131 | String risk = null; |
| 132 | - if (e.getType() == 1) { | |
| 132 | + if (e.getType() == 2) { | |
| 133 | 133 | AntExChuModel model = antenatalExaminationService.findOne(e.getfId()); |
| 134 | 134 | if (null != model) { |
| 135 | 135 | risk = model.getOtherHighRisk(); |
| 136 | 136 | } |
| 137 | - } else if (e.getType() == 2) { | |
| 137 | + } else if (e.getType() == 1) { | |
| 138 | 138 | AntenatalExaminationModel model = antenatalExaminationService.findOneById(e.getfId()); |
| 139 | 139 | if (null != model) { |
| 140 | 140 | risk = model.getOtherRisk(); |
platform-sync-data/platform-sync-data.iml
View file @
03ab5d0
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> | |
| 3 | - <component name="FacetManager"> | |
| 4 | - <facet type="web" name="Web"> | |
| 5 | - <configuration> | |
| 6 | - <descriptors> | |
| 7 | - <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" /> | |
| 8 | - </descriptors> | |
| 9 | - <webroots> | |
| 10 | - <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" /> | |
| 11 | - </webroots> | |
| 12 | - <sourceRoots> | |
| 13 | - <root url="file://$MODULE_DIR$/../platform-resource/resources" /> | |
| 14 | - <root url="file://$MODULE_DIR$/src/main/java" /> | |
| 15 | - <root url="file://$MODULE_DIR$/src/main/resources" /> | |
| 16 | - </sourceRoots> | |
| 17 | - </configuration> | |
| 18 | - </facet> | |
| 19 | - </component> | |
| 20 | - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> | |
| 21 | - <output url="file://$MODULE_DIR$/target/classes" /> | |
| 22 | - <output-test url="file://$MODULE_DIR$/target/test-classes" /> | |
| 23 | - <content url="file://$MODULE_DIR$"> | |
| 24 | - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> | |
| 25 | - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> | |
| 26 | - <excludeFolder url="file://$MODULE_DIR$/target" /> | |
| 27 | - </content> | |
| 28 | - <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> | |
| 29 | - <orderEntry type="sourceFolder" forTests="false" /> | |
| 30 | - <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.15" level="project" /> | |
| 31 | - <orderEntry type="module" module-name="platform-common" /> | |
| 32 | - <orderEntry type="module-library"> | |
| 33 | - <library name="Maven: org.wltea.analyzer:IKAnalyzer:2012_u6"> | |
| 34 | - <CLASSES> | |
| 35 | - <root url="jar://$MODULE_DIR$/../platform-operate-api/src/main/webapp/WEB-INF/lib/IKAnalyzer2012_u6.jar!/" /> | |
| 36 | - </CLASSES> | |
| 37 | - <JAVADOC /> | |
| 38 | - <SOURCES /> | |
| 39 | - </library> | |
| 40 | - </orderEntry> | |
| 41 | - <orderEntry type="module-library"> | |
| 42 | - <library name="Maven: org.apache.lucene:lucene-core:3.6.0"> | |
| 43 | - <CLASSES> | |
| 44 | - <root url="jar://$MODULE_DIR$/../platform-operate-api/src/main/webapp/WEB-INF/lib/lucene-core-3.6.0.jar!/" /> | |
| 45 | - </CLASSES> | |
| 46 | - <JAVADOC /> | |
| 47 | - <SOURCES /> | |
| 48 | - </library> | |
| 49 | - </orderEntry> | |
| 50 | - <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" /> | |
| 51 | - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" /> | |
| 52 | - <orderEntry type="module" module-name="platform-dal" /> | |
| 53 | - <orderEntry type="module" module-name="platform-biz-service" /> | |
| 54 | - <orderEntry type="module" module-name="platform-biz-patient-service" /> | |
| 55 | - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" /> | |
| 56 | - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" /> | |
| 57 | - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> | |
| 58 | - <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> | |
| 59 | - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.5.6.RELEASE" level="project" /> | |
| 60 | - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.8.6.RELEASE" level="project" /> | |
| 61 | - <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.12.5" level="project" /> | |
| 62 | - <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:jcl-over-slf4j:1.7.12" level="project" /> | |
| 63 | - <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.2.4.RELEASE" level="project" /> | |
| 64 | - <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" /> | |
| 65 | - <orderEntry type="library" name="Maven: org.springframework:spring-aspects:3.2.4.RELEASE" level="project" /> | |
| 66 | - <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.2.4.RELEASE" level="project" /> | |
| 67 | - <orderEntry type="library" name="Maven: org.springframework:spring-context:3.2.4.RELEASE" level="project" /> | |
| 68 | - <orderEntry type="library" name="Maven: org.springframework:spring-context-support:3.2.4.RELEASE" level="project" /> | |
| 69 | - <orderEntry type="library" name="Maven: org.springframework:spring-core:3.2.4.RELEASE" level="project" /> | |
| 70 | - <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.2.4.RELEASE" level="project" /> | |
| 71 | - <orderEntry type="library" name="Maven: org.springframework:spring-instrument:3.2.4.RELEASE" level="project" /> | |
| 72 | - <orderEntry type="library" name="Maven: org.springframework:spring-instrument-tomcat:3.2.4.RELEASE" level="project" /> | |
| 73 | - <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:3.2.4.RELEASE" level="project" /> | |
| 74 | - <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.2.4.RELEASE" level="project" /> | |
| 75 | - <orderEntry type="library" name="Maven: org.springframework:spring-orm:3.2.4.RELEASE" level="project" /> | |
| 76 | - <orderEntry type="library" name="Maven: org.springframework:spring-oxm:3.2.4.RELEASE" level="project" /> | |
| 77 | - <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:3.2.4.RELEASE" level="project" /> | |
| 78 | - <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.2.4.RELEASE" level="project" /> | |
| 79 | - <orderEntry type="library" name="Maven: org.springframework:spring-web:3.2.4.RELEASE" level="project" /> | |
| 80 | - <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:3.2.4.RELEASE" level="project" /> | |
| 81 | - <orderEntry type="library" name="Maven: org.springframework:spring-webmvc-portlet:3.2.4.RELEASE" level="project" /> | |
| 82 | - <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.3.0" level="project" /> | |
| 83 | - <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.3" level="project" /> | |
| 84 | - <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.34" level="project" /> | |
| 85 | - <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> | |
| 86 | - <orderEntry type="library" name="Maven: commons-logging:commons-logging-api:1.1" level="project" /> | |
| 87 | - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.4" level="project" /> | |
| 88 | - <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.4" level="project" /> | |
| 89 | - <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> | |
| 90 | - <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | |
| 91 | - <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | |
| 92 | - <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" /> | |
| 93 | - <orderEntry type="library" name="Maven: commons-io:commons-io:2.0" level="project" /> | |
| 94 | - <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" /> | |
| 95 | - <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" /> | |
| 96 | - <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.4" level="project" /> | |
| 97 | - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.5" level="project" /> | |
| 98 | - <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" /> | |
| 99 | - <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.2-pre5" level="project" /> | |
| 100 | - <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.3" level="project" /> | |
| 101 | - <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.7" level="project" /> | |
| 102 | - <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.7" level="project" /> | |
| 103 | - <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" /> | |
| 104 | - <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> | |
| 105 | - <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> | |
| 106 | - <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.5" level="project" /> | |
| 107 | - <orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" /> | |
| 108 | - <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" /> | |
| 109 | - <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.47" level="project" /> | |
| 110 | - <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.3.1" level="project" /> | |
| 111 | - <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" /> | |
| 112 | - <orderEntry type="library" name="Maven: javax.mail:mail:1.4.3" level="project" /> | |
| 113 | - <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> | |
| 114 | - <orderEntry type="library" name="Maven: javax.xml:jaxrpc-api:1.1" level="project" /> | |
| 115 | - <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:1.8.4" level="project" /> | |
| 116 | - <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" /> | |
| 117 | - <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.5" level="project" /> | |
| 118 | - <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.5" level="project" /> | |
| 119 | - <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" /> | |
| 120 | - <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.1.3.Final" level="project" /> | |
| 121 | - <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.3.GA" level="project" /> | |
| 122 | - <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.0.0" level="project" /> | |
| 123 | - <orderEntry type="library" name="Maven: com.qiniu:qiniu-java-sdk:7.0.11" level="project" /> | |
| 124 | - <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" /> | |
| 125 | - <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.1" level="project" /> | |
| 126 | - <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.6.0" level="project" /> | |
| 127 | - <orderEntry type="library" name="Maven: redis.clients:jedis:2.1.0" level="project" /> | |
| 128 | - <orderEntry type="library" name="Maven: com.google.guava:guava:19.0-rc2" level="project" /> | |
| 129 | - <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" /> | |
| 130 | - <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" /> | |
| 131 | - <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" /> | |
| 132 | - <orderEntry type="library" name="Maven: commons-chain:commons-chain:1.1" level="project" /> | |
| 133 | - <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.3.1" level="project" /> | |
| 134 | - <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" /> | |
| 135 | - <orderEntry type="library" name="Maven: sslext:sslext:1.2-0" level="project" /> | |
| 136 | - <orderEntry type="library" name="Maven: org.apache.struts:struts-core:1.3.8" level="project" /> | |
| 137 | - <orderEntry type="library" name="Maven: antlr:antlr:2.7.2" level="project" /> | |
| 138 | - <orderEntry type="library" name="Maven: org.apache.struts:struts-taglib:1.3.8" level="project" /> | |
| 139 | - <orderEntry type="library" name="Maven: org.apache.struts:struts-tiles:1.3.8" level="project" /> | |
| 140 | - <orderEntry type="library" name="Maven: com.oracle:ojdbc14:11.2.0.1.0" level="project" /> | |
| 141 | - <orderEntry type="library" name="Maven: commons-dbutils:commons-dbutils:1.6" level="project" /> | |
| 142 | - <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.8" level="project" /> | |
| 143 | - </component> | |
| 144 | -</module> |
regional-etl/regional-etl.iml
View file @
03ab5d0
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> | |
| 3 | - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> | |
| 4 | - <output url="file://$MODULE_DIR$/target/classes" /> | |
| 5 | - <output-test url="file://$MODULE_DIR$/target/test-classes" /> | |
| 6 | - <content url="file://$MODULE_DIR$"> | |
| 7 | - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> | |
| 8 | - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> | |
| 9 | - <excludeFolder url="file://$MODULE_DIR$/target" /> | |
| 10 | - </content> | |
| 11 | - <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> | |
| 12 | - <orderEntry type="sourceFolder" forTests="false" /> | |
| 13 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.3.RELEASE" level="project" /> | |
| 14 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.3.RELEASE" level="project" /> | |
| 15 | - <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> | |
| 16 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.3.RELEASE" level="project" /> | |
| 17 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.3.RELEASE" level="project" /> | |
| 18 | - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> | |
| 19 | - <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" /> | |
| 20 | - <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> | |
| 21 | - <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" /> | |
| 22 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.3.RELEASE" level="project" /> | |
| 23 | - <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> | |
| 24 | - <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> | |
| 25 | - <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.10" level="project" /> | |
| 26 | - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.2.0" level="project" /> | |
| 27 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.5.3.RELEASE" level="project" /> | |
| 28 | - <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.14" level="project" /> | |
| 29 | - <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.14" level="project" /> | |
| 30 | - <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" /> | |
| 31 | - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.2.0" level="project" /> | |
| 32 | - <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.2" level="project" /> | |
| 33 | - <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.1" level="project" /> | |
| 34 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:1.5.2.RELEASE" level="project" /> | |
| 35 | - <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver:3.4.2" level="project" /> | |
| 36 | - <orderEntry type="library" name="Maven: org.mongodb:bson:3.4.2" level="project" /> | |
| 37 | - <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.4.2" level="project" /> | |
| 38 | - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.10.3.RELEASE" level="project" /> | |
| 39 | - <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.8.RELEASE" level="project" /> | |
| 40 | - <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.8.RELEASE" level="project" /> | |
| 41 | - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.3.RELEASE" level="project" /> | |
| 42 | - <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.3.RELEASE" level="project" /> | |
| 43 | - <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.5.3.RELEASE" level="project" /> | |
| 44 | - <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.3.RELEASE" level="project" /> | |
| 45 | - <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" /> | |
| 46 | - <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" /> | |
| 47 | - <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" /> | |
| 48 | - <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.3" level="project" /> | |
| 49 | - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> | |
| 50 | - <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.6.0" level="project" /> | |
| 51 | - <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" /> | |
| 52 | - <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" /> | |
| 53 | - <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> | |
| 54 | - <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" /> | |
| 55 | - <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" /> | |
| 56 | - <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" /> | |
| 57 | - <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> | |
| 58 | - <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.41" level="project" /> | |
| 59 | - <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.31" level="project" /> | |
| 60 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:1.5.3.RELEASE" level="project" /> | |
| 61 | - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> | |
| 62 | - <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.11" level="project" /> | |
| 63 | - <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.11" level="project" /> | |
| 64 | - <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.25" level="project" /> | |
| 65 | - <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" /> | |
| 66 | - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> | |
| 67 | - </component> | |
| 68 | -</module> |