jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ca0a8d0f277ec6feafbe30c082a59ab76dfab16e

Authored by hanshaofeng
2 parents e95638454d 95d9f09029
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ ca0a8d0
... ... @@ -772,7 +772,7 @@
772 772 condition = condition.and("cityId", cityId, MongoOper.IS);
773 773 }
774 774 if(StringUtils.isNotEmpty(provinceId)){
775   - condition = condition.and("provinceId", cityId, MongoOper.IS);
  775 + condition = condition.and("provinceId", provinceId, MongoOper.IS);
776 776 }
777 777 //户籍地
778 778 if(StringUtils.isNotEmpty(provinceRegisterId)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java View file @ ca0a8d0
... ... @@ -106,7 +106,7 @@
106 106 }
107 107  
108 108 public String getHospitalId(Integer userId){
109   - List<Integer> list = matchAreaOrgId(userId);
  109 + List<Integer> list = matchOrgId(userId);
110 110 if(null==list||CollectionUtils.isEmpty(list)){
111 111 return null;
112 112 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ ca0a8d0
... ... @@ -320,14 +320,14 @@
320 320 buildType.add(0);
321 321 buildType.add(2);
322 322 patientsQuery.setBuildTypeList(buildType);
323   - //居住地
324   - patientsQuery.setAreaId(riskPatientsQueryRequest.getAreaId());
325   - patientsQuery.setCityId(riskPatientsQueryRequest.getCityId());
326   - patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceId());
  323 + //居住地 注意需要反起查询，不要搞错l
  324 + patientsQuery.setAreaRegisterId(riskPatientsQueryRequest.getAreaId());
  325 + patientsQuery.setCityRegisterId(riskPatientsQueryRequest.getCityId());
  326 + patientsQuery.setProvinceRegisterId(riskPatientsQueryRequest.getProvinceId());
327 327 //户籍地
328   - patientsQuery.setAreaRegisterId(riskPatientsQueryRequest.getAreaRegisterId());
329   - patientsQuery.setProvinceRegisterId(riskPatientsQueryRequest.getProvinceRegisterId());
330   - patientsQuery.setCityRegisterId(riskPatientsQueryRequest.getCityRegisterId());
  328 + patientsQuery.setAreaId(riskPatientsQueryRequest.getAreaRegisterId());
  329 + patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceRegisterId());
  330 + patientsQuery.setCityId(riskPatientsQueryRequest.getCityRegisterId());
331 331 List<String> hospitalList = null;
332 332 //区域范围内孕妇
333 333 if (isRegion) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ ca0a8d0
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.core.annotation.form.Form;
4 4 import com.lyms.platform.common.core.annotation.form.FormParam;
5 5 import com.lyms.platform.common.utils.DateUtil;
  6 +import com.lyms.platform.common.utils.StringUtils;
6 7 import org.apache.commons.lang.math.NumberUtils;
7 8  
8 9 import java.util.Date;
... ... @@ -302,7 +303,7 @@
302 303 }
303 304  
304 305 public Date capStart() {
305   - if (null != startDueWeek) {
  306 + if (StringUtils.isNotEmpty(startDueWeek) ) {
306 307 int start = NumberUtils.toInt(startDueWeek, 0);
307 308 Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start*7));
308 309 return endDate;
... ... @@ -311,7 +312,7 @@
311 312 }
312 313  
313 314 public Date capEnd() {
314   - if (null != endDueWeek) {
  315 + if (StringUtils.isNotEmpty(endDueWeek)) {
315 316 int end = NumberUtils.toInt(endDueWeek, 0);
316 317 Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end*7)-6);
317 318 return endDate;