Compare commits
No commits in common. "38711ec4976a9e7db18dd5d77f7d5b028f08c23f" and "b5dd8325aba93a0e0e8e44ac51dc26863c7b5673" have entirely different histories.
38711ec497
...
b5dd8325ab
|
|
@ -275,7 +275,8 @@ public class ChargeService extends BaseService {
|
||||||
chargeItemListMapper.insert(chargeServiceLists);
|
chargeItemListMapper.insert(chargeServiceLists);
|
||||||
|
|
||||||
List<ChargeGoodsList> chargeGoodsLists = new ArrayList<>();
|
List<ChargeGoodsList> chargeGoodsLists = new ArrayList<>();
|
||||||
for (ChargeGoodsListVo goods : dto.getGoodsDetail()) {
|
for (
|
||||||
|
ChargeGoodsListVo goods : dto.getGoodsDetail()) {
|
||||||
ChargeGoodsList itemList = new ChargeGoodsList();
|
ChargeGoodsList itemList = new ChargeGoodsList();
|
||||||
Goods dbGoods = goodsMapper.selectById(goods.getId());
|
Goods dbGoods = goodsMapper.selectById(goods.getId());
|
||||||
if (dbGoods == null) {
|
if (dbGoods == null) {
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,6 @@ public class PatientInfoService extends BaseService {
|
||||||
|
|
||||||
public PatientInfo save(PatientInfo patientInfo){
|
public PatientInfo save(PatientInfo patientInfo){
|
||||||
patientInfo.setCreateDatetime(LocalDateTime.now());
|
patientInfo.setCreateDatetime(LocalDateTime.now());
|
||||||
patientInfo.setLastVisitTime(patientInfo.getCreateDatetime());
|
|
||||||
if (patientInfo.getBirthday() != null && patientInfo.getAge() == null) {
|
if (patientInfo.getBirthday() != null && patientInfo.getAge() == null) {
|
||||||
int currentYear = LocalDate.now().getYear();
|
int currentYear = LocalDate.now().getYear();
|
||||||
int birthYear = patientInfo.getBirthday().getYear();
|
int birthYear = patientInfo.getBirthday().getYear();
|
||||||
|
|
@ -54,7 +53,7 @@ public class PatientInfoService extends BaseService {
|
||||||
if (level != null){
|
if (level != null){
|
||||||
patientInfo.setLevelId(level.getLevelId());
|
patientInfo.setLevelId(level.getLevelId());
|
||||||
}else {
|
}else {
|
||||||
patientInfo.setLevelId(1);
|
patientInfo.setLevelId(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<>();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue