jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c07cc8da055066b852717010e06069451f0f3489

Authored by zhangchao
1 parent e172700684
Exists in dev

#fix:新增建档、产检管理服务状态字段（用于标注当前用户是否为医心照护付费用户）

Showing 3 changed files with 50 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java View file @ c07cc8d
... ... @@ -87,6 +87,25 @@
87 87 private String reason;
88 88 private String teamIdOld;
89 89 private String teamIdNew;
  90 + //服务状态
  91 + private Integer serviceStatus;
  92 + private Integer serviceType;
  93 +
  94 + public Integer getServiceType() {
  95 + return serviceType;
  96 + }
  97 +
  98 + public void setServiceType(Integer serviceType) {
  99 + this.serviceType = serviceType;
  100 + }
  101 +
  102 + public Integer getServiceStatus() {
  103 + return serviceStatus;
  104 + }
  105 +
  106 + public void setServiceStatus(Integer serviceStatus) {
  107 + this.serviceStatus = serviceStatus;
  108 + }
90 109  
91 110 public String getTeamIdOld() {
92 111 return teamIdOld;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java View file @ c07cc8d
... ... @@ -134,7 +134,35 @@
134 134  
135 135 private Integer userType;//大同职工 1为是 0为否
136 136  
137   - public Integer getOrgType() {
  137 + //服务状态
  138 + private Integer serviceStatus;
  139 + private Integer serviceType;
  140 +
  141 + public Integer getServiceType() {
  142 + return serviceType;
  143 + }
  144 +
  145 + public void setServiceType(Integer serviceType) {
  146 + this.serviceType = serviceType;
  147 + }
  148 +
  149 + public Integer getServiceStatus() {
  150 + return serviceStatus;
  151 + }
  152 +
  153 + public void setServiceStatus(Integer serviceStatus) {
  154 + this.serviceStatus = serviceStatus;
  155 + }
  156 +
  157 + public Integer getUserType() {
  158 + return userType;
  159 + }
  160 +
  161 + public void setUserType(Integer userType) {
  162 + this.userType = userType;
  163 + }
  164 +
  165 + public Integer getOrgType() {
138 166 return orgType;
139 167 }
140 168  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java View file @ c07cc8d
... ... @@ -140,6 +140,8 @@
140 140 if(patients == null || patients.getLastMenses() == null){
141 141 continue;
142 142 }
  143 + antExManagerResult.setServiceStatus(patients.getServiceStatus());
  144 + antExManagerResult.setServiceType(patients.getServiceType());
143 145 antExRecordQuery1.setCheckTimeStart(patients.getLastMenses());
144 146 antExRecordQuery1.setCheckTimeEnd(e.getCheckTime());
145 147 antExRecordQuery1.setPid(e.getPid());