From 6fd4bdff55620c562e0a22eee3c95924951b04a4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 24 Sep 2020 14:10:28 +0800
Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
index f182753..ea78e78 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
@@ -10,7 +10,7 @@
import com.kidgrow.oprationcenter.service.ISaasClientPayService;
import com.kidgrow.oprationcenter.vo.SaasClientPayExcel;
import com.kidgrow.oprationcenter.vo.SaasClientPayVo;
-import com.kidgrow.recordcenter.feign.ChildService;
+//import com.kidgrow.recordcenter.feign.ChildService;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.model.SysDoctor;
import lombok.extern.slf4j.Slf4j;
@@ -42,8 +42,8 @@
*/
@Autowired
private SysDoctorService sysDoctorService;
- @Autowired
- private ChildService childService;
+// @Autowired
+// private ChildService childService;
@Override
public PageResult<SaasClientPayVo> findList(Map<String, Object> params){
Long doctorId = MapUtils.getLong(params, "doctorId");
@@ -69,19 +69,6 @@
beanCopier.copy(saasClientPay,vo,null);
double v = Double.parseDouble(vo.getPayPrice().toString())/100;
vo.setPrice(v+"");
-// if (StringUtils.isNotBlank(vo.getChildId())) {
-// Map<String,Object> map=new HashMap<>();
-// map.put("id",vo.getChildId());
-// ResultBody byId = childService.findById(map);
-// if(byId.getCode()==0){
-// Child parse = JSON.parseObject(JSON.toJSONString(byId.getData()), Child.class);
-// if(parse!=null){
-// vo.setChildName(parse.getChildName());
-// vo.setChildSex(parse.getChildSex());
-// vo.setChildBirthday(parse.getChildBirthday());
-// }
-// }
-// }
listVo.add(vo);
}
}
@@ -98,6 +85,22 @@
return baseMapper.findByObject(saasClientPay);
}
+ /**
+ * 查看一个科室的某个诊断的支付状态
+ * @param hospitalId
+ * @param departmentId
+ * @param diaId
+ * @return
+ */
+ @Override
+ public SaasClientPay findModelByObject(Long hospitalId,Long departmentId,String diaId) {
+ SaasClientPay saasClientPay = new SaasClientPay();
+ saasClientPay.setCreateHospitalDepartid(departmentId.toString());
+ saasClientPay.setCreateHospitalId(hospitalId);
+ saasClientPay.setDiaId(diaId);
+ return baseMapper.findByObject(saasClientPay);
+ }
+
@Override
public void updateTypeList(List<String> list) {
for (String s : list) {
--
Gitblit v1.8.0