Commit 42583cbe09f700f1c9ec313f49bf6a06096510db
Exists in
fengning2023-06-06
Merge branch 'fengning2023-06-06' of https://git.healthbaby.com.cn/jiangjiazhi/r…
…egional-platform into fengning2023-06-06
Showing 4 changed files
- platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
- platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
View file @
42583cb
| ... | ... | @@ -497,6 +497,16 @@ |
| 497 | 497 | |
| 498 | 498 | private String isFocus; |
| 499 | 499 | |
| 500 | + public String getFocusTime() { | |
| 501 | + return focusTime; | |
| 502 | + } | |
| 503 | + | |
| 504 | + public void setFocusTime(String focusTime) { | |
| 505 | + this.focusTime = focusTime; | |
| 506 | + } | |
| 507 | + | |
| 508 | + private String focusTime; | |
| 509 | + | |
| 500 | 510 | public String getVillageId() { |
| 501 | 511 | return villageId; |
| 502 | 512 | } |
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
42583cb
| ... | ... | @@ -434,6 +434,16 @@ |
| 434 | 434 | |
| 435 | 435 | private String isFocus; |
| 436 | 436 | |
| 437 | + public String getFocusTime() { | |
| 438 | + return focusTime; | |
| 439 | + } | |
| 440 | + | |
| 441 | + public void setFocusTime(String focusTime) { | |
| 442 | + this.focusTime = focusTime; | |
| 443 | + } | |
| 444 | + | |
| 445 | + private String focusTime; | |
| 446 | + | |
| 437 | 447 | public String getBooksuifangDoctor() { |
| 438 | 448 | return booksuifangDoctor; |
| 439 | 449 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
42583cb
| ... | ... | @@ -263,6 +263,10 @@ |
| 263 | 263 | patientsQuery.setNormal(riskPatientsQueryRequest.getNormal()); |
| 264 | 264 | patientsQuery.setLiveType(riskPatientsQueryRequest.getLiveType()); |
| 265 | 265 | patientsQuery.setFirstCheckId(riskPatientsQueryRequest.getFirstCheckId()); |
| 266 | + //判断是否是重点关注 | |
| 267 | + if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getIsFocus())){ | |
| 268 | + patientsQuery.setIsFocus(riskPatientsQueryRequest.getIsFocus()); | |
| 269 | + } | |
| 266 | 270 | //乡镇卫生院查询条件 |
| 267 | 271 | if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getTownOrgId())) { |
| 268 | 272 | patientsQuery.setTownOrgId(riskPatientsQueryRequest.getTownOrgId()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
View file @
42583cb
| ... | ... | @@ -204,6 +204,16 @@ |
| 204 | 204 | |
| 205 | 205 | private String isFocus; |
| 206 | 206 | |
| 207 | + public String getFocusTime() { | |
| 208 | + return focusTime; | |
| 209 | + } | |
| 210 | + | |
| 211 | + public void setFocusTime(String focusTime) { | |
| 212 | + this.focusTime = focusTime; | |
| 213 | + } | |
| 214 | + | |
| 215 | + private String focusTime; | |
| 216 | + | |
| 207 | 217 | public String getVillageRegisterId() { |
| 208 | 218 | return villageRegisterId; |
| 209 | 219 | } |