jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a8a25a1ed473f7dd8930b0c1273f147446f60fd9

Authored by wangbo
2 parents 69ea88f422 f1f9189d7c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/HealthChargeModel.java View file @ a8a25a1
... ... @@ -32,6 +32,11 @@
32 32 */
33 33 private String babyForeignId;
34 34  
  35 + /**
  36 + * 儿童膳食id
  37 + */
  38 + private String babyNutritionId;
  39 +
35 40 //打印报告等级
36 41 private Integer type;
37 42  
... ... @@ -55,6 +60,14 @@
55 60 * 报告解读人
56 61 */
57 62 private String doctorId;
  63 +
  64 + public String getBabyNutritionId() {
  65 + return babyNutritionId;
  66 + }
  67 +
  68 + public void setBabyNutritionId(String babyNutritionId) {
  69 + this.babyNutritionId = babyNutritionId;
  70 + }
58 71  
59 72 public String getDoctorId() {
60 73 return doctorId;
platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java View file @ a8a25a1
... ... @@ -35,6 +35,11 @@
35 35 */
36 36 private String babyForeignId;
37 37  
  38 + /**
  39 + * 儿童 - 膳食id
  40 + */
  41 + private String babyNutritionId;
  42 +
38 43 //打印报告等级
39 44 private Integer type;
40 45  
... ... @@ -57,6 +62,14 @@
57 62 */
58 63 private String doctorId;
59 64  
  65 + public String getBabyNutritionId() {
  66 + return babyNutritionId;
  67 + }
  68 +
  69 + public void setBabyNutritionId(String babyNutritionId) {
  70 + this.babyNutritionId = babyNutritionId;
  71 + }
  72 +
60 73 public String getBabyForeignId() {
61 74 return babyForeignId;
62 75 }
... ... @@ -119,6 +132,9 @@
119 132 }
120 133 if (null != babyForeignId) {
121 134 condition = condition.and("babyForeignId", babyForeignId, MongoOper.IS);
  135 + }
  136 + if (null != babyNutritionId) {
  137 + condition = condition.and("babyNutritionId", babyNutritionId, MongoOper.IS);
122 138 }
123 139  
124 140 Criteria c = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ a8a25a1
... ... @@ -1124,7 +1124,7 @@
1124 1124 *
1125 1125 * @return
1126 1126 */
1127   - private Date getStartDate() {
  1127 + public Date getStartDate() {
1128 1128 LocalDate with = LocalDate.now().plusYears(0).with(TemporalAdjusters.firstDayOfYear());
1129 1129 ZoneId zoneId = ZoneId.systemDefault();
1130 1130 Instant instant = with.atStartOfDay().atZone(zoneId).toInstant();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ a8a25a1
... ... @@ -84,6 +84,9 @@
84 84 @Autowired
85 85 private HealthChargeService healthChargeService;
86 86  
  87 + @Autowired
  88 + private AreaCountFacade areaCountFacade;
  89 +
87 90 public BaseObjectResponse queryBabyNutritionRecord(String babyId) {
88 91 Map<String, Object> resMap = new HashMap<>();
89 92 BabyBasicResult base = new BabyBasicResult();
... ... @@ -629,7 +632,8 @@
629 632  
630 633 data.put("wlysitems", wlysitems);
631 634  
632   - healthChargeFacade.addHealthCharge(hospitalId, 4, model.getId(), null, null, userId, model.getInterpretDoctorId(), true);
  635 + healthChargeFacade.addHealthCharge(hospitalId, 4, baby.getId(), null, null,
  636 + userId, model.getInterpretDoctorId(), true, model.getId());
633 637 }
634 638 BaseObjectResponse objectResponse = new BaseObjectResponse();
635 639 objectResponse.setData(data);
636 640  
637 641  
638 642  
639 643  
... ... @@ -942,18 +946,74 @@
942 946 healthChargeQuery.setYn(YnEnums.YES.getId());
943 947 healthChargeQuery.setHospitalId(request.getHospitalId());
944 948 healthChargeQuery.setStatus(1);
945   - // TODO: 2019/5/27 时间默认值未指定
946   - healthChargeQuery.setCreatedEnd(request.getStartTime());
947   - healthChargeQuery.setCreatedEnd(request.getEndTime());
  949 + // 默认值-年初
  950 + Date startDate = areaCountFacade.getStartDate();
  951 + healthChargeQuery.setCreatedStart(startDate);
  952 + healthChargeQuery.setCreatedEnd(new Date());
  953 + if (request.getStartTime() != null){
  954 + healthChargeQuery.setCreatedStart(request.getStartTime());
  955 + healthChargeQuery.setCreatedEnd(request.getEndTime());
  956 + }
  957 + String findNo = request.getNumber();
  958 + String keyword = request.getKeyword();
  959 +
948 960 List<HealthChargeModel> list = healthChargeService.queryHealthChargeList(healthChargeQuery);
  961 + List<HealthChargeModel> resultList = new LinkedList<>();
949 962 if (CollectionUtils.isNotEmpty(list)){
950 963 for (HealthChargeModel model: list){
951   - // TODO: 2019/5/27 根据babyid 获取母亲id 儿童姓名进行筛选
  964 + String babyForeignId = model.getBabyForeignId();
  965 +
  966 + if (StringUtils.isNotEmpty(findNo) && StringUtils.isNotEmpty(keyword)){
  967 + List<BabyModel> babyModels = getBabyModels(findNo, babyForeignId);
  968 + if (CollectionUtils.isNotEmpty(babyModels)){
  969 + BabyModel babyModel = babyModels.get(0);
  970 + String name = babyModel.getName();
  971 + if (name.contains(keyword)){
  972 + resultList.add(model);
  973 + }
  974 + }
  975 + }
  976 +
  977 + if (StringUtils.isNotEmpty(findNo)){
  978 + List<BabyModel> babyModels = getBabyModels(findNo, babyForeignId);
  979 + if (CollectionUtils.isNotEmpty(babyModels)){
  980 + resultList.add(model);
  981 + }
  982 + }
  983 +
  984 + if (StringUtils.isNotEmpty(keyword)){
  985 + BabyModelQuery babyQuery = new BabyModelQuery();
  986 + babyQuery.setId(babyForeignId);
  987 + babyQuery.setQueryNo(findNo);
  988 + babyQuery.setYn(YnEnums.YES.getId());
  989 + }
  990 +
  991 + if (StringUtils.isEmpty(findNo) && StringUtils.isEmpty(keyword)){
  992 + resultList.add(model);
  993 + }
952 994 }
953 995 }
  996 + BaseListResponse objectResponse = new BaseListResponse();
  997 + objectResponse.setData(list);
  998 + objectResponse.setPageInfo(healthChargeQuery.getPageInfo());
  999 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  1000 + objectResponse.setErrormsg("成功");
  1001 + return objectResponse;
  1002 + }
954 1003  
955   -
956   - return null;
  1004 + /**
  1005 + * 获取儿童
  1006 + *
  1007 + * @param findNo
  1008 + * @param babyForeignId
  1009 + * @return
  1010 + */
  1011 + private List<BabyModel> getBabyModels(String findNo, String babyForeignId) {
  1012 + BabyModelQuery babyQuery = new BabyModelQuery();
  1013 + babyQuery.setId(babyForeignId);
  1014 + babyQuery.setQueryNo(findNo);
  1015 + babyQuery.setYn(YnEnums.YES.getId());
  1016 + return babyBookbuildingService.queryBabyBuildByCond(babyQuery);
957 1017 }
958 1018 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java View file @ a8a25a1
... ... @@ -88,6 +88,30 @@
88 88 return addHealthCharge(request, userId);
89 89 }
90 90  
  91 + public BaseResponse addHealthCharge(String hospitalId,
  92 + Integer healthType,
  93 + String foreignId,
  94 + Integer type,
  95 + Integer source,
  96 + Integer userId,
  97 + String doctorId,
  98 + boolean isBaby,
  99 + String babyNutritionId){
  100 + HealthChargeRequest request = new HealthChargeRequest();
  101 + request.setHospitalId(hospitalId);
  102 + request.setHealthType(healthType);
  103 + if (isBaby){
  104 + request.setBabyForeignId(foreignId);
  105 + request.setBabyNutritionId(babyNutritionId);
  106 + } else {
  107 + request.setForeignId(foreignId);
  108 + request.setType(type);
  109 + request.setSource(source);
  110 + }
  111 + request.setDoctorId(doctorId);
  112 + return addHealthCharge(request, userId);
  113 + }
  114 +
91 115 /**
92 116 * 打印体重、血糖、血压调用接口
93 117 * @param hospitalId 医院id
... ... @@ -123,6 +147,7 @@
123 147 if (StringUtils.isNotEmpty(babyForeignId)){
124 148 // 儿童
125 149 healthChargeQuery.setBabyForeignId(babyForeignId);
  150 + healthChargeQuery.setBabyNutritionId(request.getBabyNutritionId());
126 151 }else {
127 152 // 孕妇
128 153 healthChargeQuery.setForeignId(request.getForeignId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HealthChargeRequest.java View file @ a8a25a1
... ... @@ -28,6 +28,11 @@
28 28 */
29 29 private String babyForeignId;
30 30  
  31 + /**
  32 + * 儿童膳食id
  33 + */
  34 + private String babyNutritionId;
  35 +
31 36 //打印报告类别 1普通报告 2高危报告
32 37 private Integer type;
33 38  
34 39  
... ... @@ -51,7 +56,16 @@
51 56 model.setSource(source);
52 57 model.setDoctorId(doctorId);
53 58 model.setBabyForeignId(babyForeignId);
  59 + model.setBabyNutritionId(babyNutritionId);
54 60 return model;
  61 + }
  62 +
  63 + public String getBabyNutritionId() {
  64 + return babyNutritionId;
  65 + }
  66 +
  67 + public void setBabyNutritionId(String babyNutritionId) {
  68 + this.babyNutritionId = babyNutritionId;
55 69 }
56 70  
57 71 public String getBabyForeignId() {