Commit ff70f467914efc5ebbc6f3faa5bbb30829229188

Authored by jiangjiazhi
1 parent b2e05bf557

增加权限

Showing 2 changed files with 51 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ ff70f46
... ... @@ -83,9 +83,9 @@
83 83 puerperaQuery.setKeyword(managerRequest.getKeyword());
84 84 puerperaQuery.setCommunityId(managerRequest.getCommunityId());
85 85 puerperaQuery.setVisitstatus(managerRequest.getVisitstatus());
  86 + puerperaQuery.setType(3);
86 87 puerperaQuery.setNeed("1");
87 88 puerperaQuery.setYn(YnEnums.YES.getId());
88   - puerperaQuery.setType(1);
89 89 // 调用service查询
90 90  
91 91 List<Patients> puerperaList = patientsService.queryPatient(puerperaQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java View file @ ff70f46
... ... @@ -460,7 +460,9 @@
460 460  
461 461 public SimpleVisitPuerpera getPuerpera() {
462 462 SimpleVisitPuerpera puerperaModel = new SimpleVisitPuerpera();
463   -
  463 + puerperaModel.setAreaId(areaId);
  464 + puerperaModel.setCityId(cityId);
  465 + puerperaModel.setProvinceId(provinceId);
464 466 puerperaModel.setId(parentId);
465 467 puerperaModel.setName(name);
466 468 puerperaModel.setAge(age);
467 469  
... ... @@ -468,10 +470,10 @@
468 470 puerperaModel.setDueDate(dueDate);
469 471 puerperaModel.setDeliverOrg(deliverOrg);
470 472 puerperaModel.setDueType(dueType);
471   - puerperaModel.setAddress(JsonUtil.obj2JsonString(address));
  473 + puerperaModel.setAddress(address);
472 474 return puerperaModel;
473 475 }
474   - public Patients getPatients(){
  476 + public Patients getPatients() {
475 477 Patients patients = new Patients();
476 478 patients.setId(parentId);
477 479 patients.setUsername(name);
... ... @@ -547,6 +549,34 @@
547 549  
548 550 private String address;
549 551  
  552 + private int provinceId;
  553 + private int cityId;
  554 + private int areaId;
  555 +
  556 + public int getAreaId() {
  557 + return areaId;
  558 + }
  559 +
  560 + public void setAreaId(int areaId) {
  561 + this.areaId = areaId;
  562 + }
  563 +
  564 + public int getCityId() {
  565 + return cityId;
  566 + }
  567 +
  568 + public void setCityId(int cityId) {
  569 + this.cityId = cityId;
  570 + }
  571 +
  572 + public int getProvinceId() {
  573 + return provinceId;
  574 + }
  575 +
  576 + public void setProvinceId(int provinceId) {
  577 + this.provinceId = provinceId;
  578 + }
  579 +
550 580 public SimpleVisitPuerpera() {
551 581 }
552 582  
... ... @@ -559,6 +589,7 @@
559 589 deliverOrg = model.getDeliverOrg();
560 590 dueType = model.getDueType();
561 591 address = model.getAddress();
  592 +// cityId =model.getc
562 593 }
563 594 public SimpleVisitPuerpera(Patients model) {
564 595 id = model.getId();
... ... @@ -569,6 +600,10 @@
569 600 deliverOrg = model.getDeliverOrg();
570 601 dueType = model.getDueType();
571 602 address = model.getAddress();
  603 + cityId=model
  604 + .getCityId();
  605 + areaId=model.getAreaId();
  606 + provinceId=model.getProvinceId();
572 607 }
573 608  
574 609 public String getId() {
... ... @@ -660,6 +695,9 @@
660 695 result = prime * result + ((dueType == null) ? 0 : dueType.hashCode());
661 696 result = prime * result + ((id == null) ? 0 : id.hashCode());
662 697 result = prime * result + ((name == null) ? 0 : name.hashCode());
  698 + result = prime * result + cityId;
  699 + result = prime * result + areaId;
  700 + result = prime * result + provinceId;
663 701 return result;
664 702 }
665 703  
... ... @@ -691,6 +729,15 @@
691 729 if (name == null) {
692 730 if (other.name != null) return false;
693 731 } else if (!name.equals(other.name)) return false;
  732 + if(((SimpleVisitPuerpera) obj).provinceId !=provinceId){
  733 + return false;
  734 + }
  735 + if(((SimpleVisitPuerpera) obj).cityId !=cityId){
  736 + return false;
  737 + }
  738 + if(((SimpleVisitPuerpera) obj).areaId !=areaId){
  739 + return false;
  740 + }
694 741 return true;
695 742 }
696 743 }