Commit 15e11b732c8434f114580dd4839de1abe9221fe2
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 3 changed files
platform-common/src/main/java/com/lyms/platform/common/enums/EyeHighRiskEnums.java
View file @
15e11b7
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/QhdDjq.java
View file @
15e11b7
| ... | ... | @@ -46,6 +46,16 @@ |
| 46 | 46 | |
| 47 | 47 | //姓名 |
| 48 | 48 | private String patName; |
| 49 | + //操作人 | |
| 50 | + private String workerId; | |
| 51 | + | |
| 52 | + public String getWorkerId() { | |
| 53 | + return workerId; | |
| 54 | + } | |
| 55 | + | |
| 56 | + public void setWorkerId(String workerId) { | |
| 57 | + this.workerId = workerId; | |
| 58 | + } | |
| 49 | 59 | |
| 50 | 60 | public String getPatName() { |
| 51 | 61 | return patName; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java
View file @
15e11b7
| ... | ... | @@ -280,18 +280,15 @@ |
| 280 | 280 | model.setPostDoc(checkDoctor); |
| 281 | 281 | model.setApplyInfo("产检"); |
| 282 | 282 | model.setApplyTime(DateUtil.getyyyy_MM_dd_hms(new Date())); |
| 283 | - | |
| 283 | + model.setRemark(""); | |
| 284 | 284 | Users users = usersService.getUsers(getUserId(request)); |
| 285 | 285 | if (users != null) { |
| 286 | - model.setRemark(users.getAccount()); | |
| 286 | + model.setWorkerId(users.getAccount()); | |
| 287 | 287 | } |
| 288 | 288 | else |
| 289 | 289 | { |
| 290 | - model.setRemark(""); | |
| 290 | + model.setWorkerId(""); | |
| 291 | 291 | } |
| 292 | - | |
| 293 | - | |
| 294 | - | |
| 295 | 292 | } |
| 296 | 293 | String result = HospitalCouponPrintUtils.qhdCouponUse(model); |
| 297 | 294 | if("0".equals(result)){ |