jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3f5fdb0b16e7545a5c614cd7d30be5b8b0f0d7a8

Authored by yangfei
2 parents 29b99c1761 43efa0c8b5
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 14 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java View file @ 3f5fdb0
... ... @@ -325,7 +325,8 @@
325 325 if(person.getType() == 2) {
326 326 BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class);
327 327 restMap.put("vcCardNo", baby.getVcCardNo()); /** 就诊卡号 */
328   - restMap.put("cardNo", baby.getCardNo()); /** 证件号 */
  328 +// restMap.put("cardNo", baby.getCardNo()); /** 证件号 */
  329 + restMap.put("cardNo", person.getCardNo()); /** 证件号 */
329 330 restMap.put("pcerteTypeId", baby.getFcertTypeId()); /** 证件类型id */
330 331 } else {
331 332 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class);
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 3f5fdb0
... ... @@ -209,7 +209,16 @@
209 209 private String provinceId;
210 210  
211 211 private String cityId;
  212 + private String streetId;
212 213  
  214 + public String getStreetId() {
  215 + return streetId;
  216 + }
  217 +
  218 + public void setStreetId(String streetId) {
  219 + this.streetId = streetId;
  220 + }
  221 +
213 222 public String getProvinceId() {
214 223 return provinceId;
215 224 }
... ... @@ -557,6 +566,9 @@
557 566 }
558 567 if (null != areaId) {
559 568 condition = condition.and("areaId", areaId, MongoOper.IS);
  569 + }
  570 + if (null != streetId) {
  571 + condition = condition.and("streetId", streetId, MongoOper.IS);
560 572 }
561 573  
562 574 if (null != enable) {
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 3f5fdb0
... ... @@ -1069,10 +1069,11 @@
1069 1069 MongoCondition con2 = MongoCondition.newInstance("username", "^" + queryNo, MongoOper.LIKE);
1070 1070 MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
1071 1071 MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS);
  1072 + MongoCondition con5 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS);
1072 1073 if(c1!=null) {
1073   - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria());
  1074 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4,con5}).getCriteria());
1074 1075 }else {
1075   - c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria();
  1076 + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4,con5}).getCriteria();
1076 1077 }
1077 1078 }
1078 1079 if (null != phoneOrCert) {
platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java View file @ 3f5fdb0
... ... @@ -152,6 +152,10 @@
152 152 if (StringUtils.isNotBlank(areaId)) {
153 153 condition = condition.and("areaId", areaId, MongoOper.IS);
154 154 }
  155 + if (StringUtils.isNotBlank(streetId)) {
  156 + condition = condition.and("streetId", streetId, MongoOper.IS);
  157 + }
  158 +
155 159 if (StringUtils.isNotBlank(provinceRegisterId)) {
156 160 condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS);
157 161 }
... ... @@ -161,6 +165,11 @@
161 165 if (StringUtils.isNotBlank(areaRegisterId)) {
162 166 condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS);
163 167 }
  168 +
  169 + if (StringUtils.isNotBlank(streetRegisterId)) {
  170 + condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS);
  171 + }
  172 +
164 173 if (StringUtils.isNotBlank(vcCardNo)) {
165 174 condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
166 175 }
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java View file @ 3f5fdb0
... ... @@ -1012,6 +1012,10 @@
1012 1012 risks.setPatientId(patientId);
1013 1013  
1014 1014 String srt = sb.toString();
  1015 + if(sb.toString().endsWith("、")){
  1016 + sb.setLength(srt.length()-1);
  1017 + srt=sb.toString();
  1018 + }
1015 1019 risks.setTitle(srt);
1016 1020 risks.setReason(srt);
1017 1021 Integer crisis = 0;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ 3f5fdb0
... ... @@ -204,6 +204,7 @@
204 204 @RequestParam(value = "provinceId",required = false) String provinceId,
205 205 @RequestParam(value = "cityId",required = false) String cityId,
206 206 @RequestParam(value = "areaId",required = false) String areaId,
  207 + @RequestParam(value = "streetId",required = false) String streetId,
207 208 @RequestParam(value = "hospitalProvinceId",required = false) String hospitalProvinceId,
208 209 @RequestParam(value = "hospitalCityId",required = false) String hospitalCityId,
209 210 @RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId,
... ... @@ -236,6 +237,7 @@
236 237 request.setCityId(cityId);
237 238 // 区/县
238 239 request.setAreaId(areaId);
  240 + request.setStreetId(streetId);
239 241 // 建档医院
240 242 request.setHospitalProvinceId(hospitalProvinceId);
241 243 request.setHospitalCityId(hospitalCityId);
... ... @@ -272,6 +274,7 @@
272 274 @RequestParam(value = "provinceId",required = false) String provinceId,
273 275 @RequestParam(value = "cityId",required = false) String cityId,
274 276 @RequestParam(value = "areaId",required = false) String areaId,
  277 + @RequestParam(value = "streetId",required = false) String streetId,
275 278 @RequestParam(value = "hospitalProvinceId",required = false) String hospitalProvinceId,
276 279 @RequestParam(value = "hospitalCityId",required = false) String hospitalCityId,
277 280 @RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId,
... ... @@ -303,6 +306,7 @@
303 306 request.setCityId(cityId);
304 307 // 区/县
305 308 request.setAreaId(areaId);
  309 + request.setStreetId(streetId);
306 310 // 建档医院
307 311 request.setHospitalProvinceId(hospitalProvinceId);
308 312 request.setHospitalCityId(hospitalCityId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 3f5fdb0
... ... @@ -608,7 +608,6 @@
608 608 if (CollectionUtils.isNotEmpty(list)) {
609 609 for (AntExManagerResult aer : list) {
610 610 data.put("checkTime", aer.getCheckTime());
611   - data.put("barCode", aer.getBarCode());
612 611 data.put("name", aer.getName());
613 612 data.put("age", aer.getAge());
614 613 data.put("cDueWeek", aer.getcDueWeek());
... ... @@ -627,7 +626,6 @@
627 626 OutputStream out = httpServletResponse.getOutputStream();
628 627 Map<String, String> cnames = new LinkedHashMap<>();
629 628 cnames.put("checkTime", "产检日期");
630   - cnames.put("barCode", "条形码");
631 629 cnames.put("name", "姓名");
632 630 cnames.put("age", "年龄");
633 631 cnames.put("cDueWeek", "产检孕周");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 3f5fdb0
... ... @@ -1292,7 +1292,7 @@
1292 1292 }
1293 1293 }
1294 1294 //如果最后一条是复查 4 5 6 分娩 复查 终止妊娠
1295   - if ("456".indexOf(list.get(list.size() - 1).getType()) > -1) {
  1295 + if ("4567".indexOf(list.get(list.size() - 1).getType()) > -1) {
1296 1296 for (int i = 0; i < list.size() - 1; i++) {
1297 1297 list.get(i).setEnableEdit("0");
1298 1298 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 3f5fdb0
... ... @@ -2070,6 +2070,8 @@
2070 2070 babyQuery.setCityId(StringUtils.isEmpty(request.getCityId())?null:request.getCityId());
2071 2071 // 区/县
2072 2072 babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId())?null:request.getAreaId());
  2073 +
  2074 + babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId());
2073 2075 babyQuery.setQueryNo(request.getQueryNo());
2074 2076 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "modified", Sort.Direction.DESC);
2075 2077  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 3f5fdb0
... ... @@ -71,7 +71,7 @@
71 71 public DischargeAbstractSaveResult save(DischargeAbstractSaveRequest dischargeAbstractSaveRequest, Integer userId) {
72 72  
73 73 DischargeAbstractSaveResult dischargeAbstractSaveResult = new DischargeAbstractSaveResult();
74   -
  74 + String hId=autoMatchFacade.getHospitalId(userId);
75 75 /** 验证产检券是否可用 可用就改为已使用状态 */
76 76 if(StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) {
77 77 BaseObjectResponse resp = couponService.validate(dischargeAbstractSaveRequest.getCouponCode(), dischargeAbstractSaveRequest.getCouponType(), autoMatchFacade.getHospitalId(userId));
78 78  
... ... @@ -95,12 +95,13 @@
95 95 String pid = patientsService.findOnePatientById(dischargeAbstractSaveRequest.getPatientId()).getPid();
96 96 dischargeAbstractMotherModel.setPid(pid);
97 97 dischargeAbstractMotherModel.setYn(YnEnums.YES.getId());
  98 + dischargeAbstractMotherModel.setHospitalId(hId);
98 99 if (StringUtils.isEmpty(dischargeAbstractMotherModel.getId())) {
99 100 dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel);
100 101  
101 102 /** 使用优惠券 */
102 103 if(StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) {
103   - couponService.use(autoMatchFacade.getHospitalId(userId), dischargeAbstractSaveRequest.getCouponCode(), userId, dischargeAbstractMotherModel.getId());
  104 + couponService.use(hId, dischargeAbstractSaveRequest.getCouponCode(), userId, dischargeAbstractMotherModel.getId());
104 105 }
105 106 } else {
106 107 dischargeAbstractMotherService.update(dischargeAbstractMotherModel);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 3f5fdb0
... ... @@ -884,6 +884,7 @@
884 884 patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
885 885 patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
886 886 patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
  887 + patientManagerQueryModel.setId(patients.getId());
887 888 patientManagerQueryModelList.add(patientManagerQueryModel);
888 889 }
889 890 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java View file @ 3f5fdb0
... ... @@ -178,7 +178,7 @@
178 178 map.put("username",model.getUsername());
179 179 map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
180 180 map.put("age",DateUtil.getAge(model.getBirthday()));
181   - map.put("householdRegister", CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityId(),
  181 + map.put("householdRegister", CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(),
182 182 model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService));
183 183 map.put("Residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(),
184 184 model.getStreetId(), model.getAddress(), basicConfigService));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java View file @ 3f5fdb0
... ... @@ -64,6 +64,8 @@
64 64  
65 65 private String areaId;
66 66  
  67 + private String streetId;
  68 +
67 69 private String hospitalProvinceId;
68 70  
69 71 private String hospitalCityId;
... ... @@ -81,6 +83,14 @@
81 83 private String evaluate;
82 84 //查询号
83 85 private String queryNo;
  86 +
  87 + public String getStreetId() {
  88 + return streetId;
  89 + }
  90 +
  91 + public void setStreetId(String streetId) {
  92 + this.streetId = streetId;
  93 + }
84 94  
85 95 public String getQueryNo() {
86 96 return queryNo;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java View file @ 3f5fdb0
... ... @@ -74,6 +74,16 @@
74 74  
75 75 private String cardNo;
76 76  
  77 + private String id;
  78 +
  79 + public String getId() {
  80 + return id;
  81 + }
  82 +
  83 + public void setId(String id) {
  84 + this.id = id;
  85 + }
  86 +
77 87 public String getCardNo() {
78 88 return cardNo;
79 89 }