clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: clinic-v2:b5dd8325aba93a0e0e8e44ac51dc26863c7b5673
Branches Tags
clinic-v2:master
clinic-v2:fea_tongmingxuan_xinjiangbushu
...
compare: clinic-v2:38711ec4976a9e7db18dd5d77f7d5b028f08c23f
Branches Tags
clinic-v2:fea_tongmingxuan_xinjiangbushu
clinic-v2:master

2 Commits
b5dd8325ab ... 38711ec497

Author SHA1 Message Date
LiJianZhao 38711ec497 Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server 2025-05-22 09:19:35 +08:00
LiJianZhao d439c5760a dev 2025-05-22 09:19:28 +08:00
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

3
src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
View File

@ -275,8 +275,7 @@ public class ChargeService extends BaseService {
chargeItemListMapper.insert(chargeServiceLists); chargeItemListMapper.insert(chargeServiceLists);
List<ChargeGoodsList> chargeGoodsLists = new ArrayList<>(); List<ChargeGoodsList> chargeGoodsLists = new ArrayList<>();
for ( for (ChargeGoodsListVo goods : dto.getGoodsDetail()) {
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) {

3
src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java
View File

@ -44,6 +44,7 @@ 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();
@ -53,7 +54,7 @@ public class PatientInfoService extends BaseService {
if (level != null){ if (level != null){
patientInfo.setLevelId(level.getLevelId()); patientInfo.setLevelId(level.getLevelId());
}else { }else {
patientInfo.setLevelId(0); patientInfo.setLevelId(1);
} }
QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<>();