陈昶聿
7 天以前 7b1f7bf57a633a8f8b189f1203e7eaeb040e1b9d
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1165,7 +1165,7 @@
        List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.callSpQueryOuthosp(patMedOuthospreq);
        for (PatMedOuthosp patMedOuthosp1 : patMedOuthosps) {
            PatArchive pa = patArchiveMapper.selectPatArchiveByPatid(patMedOuthosp1.getPatid());
            if (patArchive.getBirthdate() != null) {
            if (ObjectUtils.isNotEmpty(patArchive) && patArchive.getBirthdate() != null) {
                Map<String, String> map = calculateAge(pa.getBirthdate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
                pa.setAge(ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
                pa.setAgeUnit(map.get("ageUnit"));
@@ -1243,10 +1243,22 @@
            i = patMedOuthospService.insertPatMedOuthosp(patMedOuthosp);
        }
        Date adminDate = externalJZInfo.getJiuZhenRQ();
        Date adminDate = patMedOuthosp.getAdmitdate();
        //完成接诊 已经完成任务再次随访
        if(ObjectUtils.isNotEmpty(visitTimeNum) && ObjectUtils.isNotEmpty(adminDate)){
            patMedOuthospService.followUpAgainByPatMedOuthosp(patMedOuthosp, adminDate, visitTimeNum);
        if(ObjectUtils.isNotEmpty(visitTimeNum)
                && ObjectUtils.isNotEmpty(adminDate)
                && StringUtils.isNotEmpty(patMedOuthosp.getFuflag())
                && patMedOuthosp.getFuflag().equals("1")){
            if(visitTimeUnit.equals("天")){
                visitTimeNum = visitTimeNum;
            }else if(visitTimeUnit.equals("周")){
                visitTimeNum = visitTimeNum * 7;
            }else if(visitTimeUnit.equals("月")){
                visitTimeNum = visitTimeNum * 30;
            }else if(visitTimeUnit.equals("年")){
                visitTimeNum = visitTimeNum * 365;
            }
            patMedOuthospService.dealPatMedOuthosp(patMedOuthosp, visitTimeNum);
        }
        if (i > 0) {
@@ -1458,6 +1470,10 @@
                return info;
            }).collect(Collectors.toList()) : null;
            if(ObjectUtils.isNotEmpty(patMedOperation.getId())){
                patMedOperationItemMapper.deleteHardPatMedOperationItemByOpId(patMedOperation.getId().toString());
            }
            //addMianTableFalg是否需要将主手术的信息放到PatMedOperation表中(只有第一个主手术信息需要放,后面的都不需要放了,也就是说,第一个放完后,就要把这个flag改成false)
            Boolean addMianTableFalg = true;
            for (ExternalOperationDetail externalOperationDetail : externalOperationDetails) {
@@ -1491,6 +1507,7 @@
                    addMianTableFalg = false;
                }
                patMedOperationItem.setCreateTime(new Date());
                patMedOperationItem.setUpdateTime(new Date());
                patMedOperationItemMapper.insertPatMedOperationItem(patMedOperationItem);
            }
        }