Commit e3952cbc1e2237e4d99b7b466914320a016341fc
1 parent
0b6dd796ce
Exists in
master
and in
6 other branches
操作日志
Showing 2 changed files with 28 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java
View file @
e3952cb
| ... | ... | @@ -125,8 +125,27 @@ |
| 125 | 125 | map.put("emergenceId", data.getId()); |
| 126 | 126 | map.put("hospitalId", data.getHospitalId()); |
| 127 | 127 | content.put("type", data.getItemName()); |
| 128 | - content.put("ref", data.getRef() + " " + data.getUnit()); | |
| 129 | - content.put("real", data.getResult() + " " + data.getUnit()); | |
| 128 | + String ref = ""; | |
| 129 | + if (data.getRef() != null && data.getUnit() != null) | |
| 130 | + { | |
| 131 | + ref = data.getRef() + " " + data.getUnit(); | |
| 132 | + } | |
| 133 | + else if (data.getRef() != null) | |
| 134 | + { | |
| 135 | + ref = data.getRef(); | |
| 136 | + } | |
| 137 | + content.put("ref", ref); | |
| 138 | + | |
| 139 | + String real = ""; | |
| 140 | + if (data.getResult() != null && data.getUnit() != null) | |
| 141 | + { | |
| 142 | + real = data.getResult() + " " + data.getUnit(); | |
| 143 | + } | |
| 144 | + else if (data.getResult() != null) | |
| 145 | + { | |
| 146 | + real = data.getResult(); | |
| 147 | + } | |
| 148 | + content.put("real", real); | |
| 130 | 149 | map.put("content", JsonUtil.obj2JsonString(content)); |
| 131 | 150 | map.put("applyDoctorCode", data.getApplyDoctorCode()); |
| 132 | 151 | map.put("applyDoctorName", data.getApplyDoctorName()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
e3952cb
| ... | ... | @@ -68,6 +68,9 @@ |
| 68 | 68 | @Autowired |
| 69 | 69 | private OrganizationGroupsFacade groupsFacade; |
| 70 | 70 | |
| 71 | + @Autowired | |
| 72 | + private OperateLogFacade operateLogFacade; | |
| 73 | + | |
| 71 | 74 | /** |
| 72 | 75 | * 增加转诊申请 |
| 73 | 76 | * |
| ... | ... | @@ -182,6 +185,8 @@ |
| 182 | 185 | patients.setExpVip(0); |
| 183 | 186 | patients.setEnable("0"); |
| 184 | 187 | id = patientsService.addPatient(patients).getId(); |
| 188 | + | |
| 189 | + operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),patients,OptActionEnums.ADD.getId(),"添加孕妇转诊"); | |
| 185 | 190 | } else { |
| 186 | 191 | Patients patients1 = patientsList.get(0); |
| 187 | 192 | id = patients1.getId(); |
| ... | ... | @@ -257,6 +262,8 @@ |
| 257 | 262 | babyModel.setBuildType(3); |
| 258 | 263 | babyModel.setEnable("0"); |
| 259 | 264 | id = babyService.addOneBaby(babyModel).getId(); |
| 265 | + | |
| 266 | + operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),babyModel,OptActionEnums.ADD.getId(),"添加儿童转诊"); | |
| 260 | 267 | } else { |
| 261 | 268 | BabyModel babyModel1 = babyModels.get(0); |
| 262 | 269 | id = babyModel1.getId(); |