From abba1aff81da3cc9d74d75f64cbd48d25716aec3 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Mar 2021 19:19:10 +0800
Subject: [PATCH] 1、增加对于套餐中的剩余读片量、有效开始日期、结束日期的加密 2、增加扣费过程中对于剩余读片量的加密 3、为下载私有云数据库增加合同与明细的查询Feign接口 4、修改合作商数据库(影像版API)的合同与明细的查询bug

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/EquipmentDockingController.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/EquipmentDockingController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/EquipmentDockingController.java
index 5e0c713..3383b2c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/EquipmentDockingController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/EquipmentDockingController.java
@@ -94,14 +94,9 @@
         } else {
 
             boolean v = false;
-            if(equipmentDocking.getId()==null){
-                //hospital_id+depart_id+machine_code进行md5加密生成的32位小写的字符串
-                String md5Password = DigestUtils.md5DigestAsHex((""+equipmentDocking.getHospitalId()+equipmentDocking.getDepartId()+equipmentDocking.getMachineCode()).getBytes());
-                equipmentDocking.setOutAccesskey(md5Password);
-                v = equipmentDockingService.saveOrUpdate(equipmentDocking);
-            }else {
-                v = equipmentDockingService.saveOrUpdate(equipmentDocking);
-            }
+            String md5Password = DigestUtils.md5DigestAsHex(("" + equipmentDocking.getHospitalId() + equipmentDocking.getDepartId() + equipmentDocking.getMachineCode()).getBytes());
+            equipmentDocking.setOutAccesskey(md5Password);
+            v = equipmentDockingService.saveOrUpdate(equipmentDocking);
             if (v) {
                 return ResultBody.ok().data(equipmentDocking).msg("保存成功");
             } else {

--
Gitblit v1.8.0