代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/integrate/service/BaseHospitalUserActivityService.java

@@ -87,18 +87,22 @@ public class BaseHospitalUserActivityService extends BaseJpaService<BaseHospital
            String type = map.get("type").toString();
            if (type.equalsIgnoreCase("1")){
                BaseDoctorDO doctorDO = doctorDao.findByIdAndDel(user);
                map.put("name",doctorDO.getName());
                map.put("sex",doctorDO.getSex());
                map.put("age", DateUtil.getAgeForIdcard(doctorDO.getIdcard()));
                map.put("mobile",doctorDO.getMobile());
                map.put("idcard",doctorDO.getIdcard());
                if(doctorDO!=null){
                    map.put("name",doctorDO.getName());
                    map.put("sex",doctorDO.getSex());
                    map.put("age", DateUtil.getAgeForIdcard(doctorDO.getIdcard()));
                    map.put("mobile",doctorDO.getMobile());
                    map.put("idcard",doctorDO.getIdcard());
                }
            }else if (type.equalsIgnoreCase("2")){
                BasePatientDO patientDO = patientDao.findById(user).get();
                map.put("name",patientDO.getName());
                map.put("sex",patientDO.getSex());
                map.put("age", DateUtil.getAgeForIdcard(patientDO.getIdcard()));
                map.put("mobile",patientDO.getMobile());
                map.put("idcard",patientDO.getIdcard());
                BasePatientDO patientDO = patientDao.findById(user).orElse(null);
                if(patientDO!=null){
                    map.put("name",patientDO.getName());
                    map.put("sex",patientDO.getSex());
                    map.put("age", DateUtil.getAgeForIdcard(patientDO.getIdcard()));
                    map.put("mobile",patientDO.getMobile());
                    map.put("idcard",patientDO.getIdcard());
                }
            }
            String integrateSql ="SELECT IFNULL(SUM(integrate),0) as total FROM base_hospital_user_integrate where user='"+user+"' and relation_code='"+map.get("relationCode")+"' ";
            List<Map<String, Object>> rstotal = hibenateUtils.createSQLQuery(integrateSql);

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServiceItemPlanDO.java

@@ -30,6 +30,7 @@ public class ServiceItemPlanDO extends UuidIdentityEntityWithCreateTime {
    private String appendixs;//附件
    private String guidanceMessage;//指导留言
    private String followupStatus;//随访状态 0取消 1已完成 2未开始 3进行中 4待审核
    @Column(name = "patient")
    public String getPatient() {
@@ -148,4 +149,13 @@ public class ServiceItemPlanDO extends UuidIdentityEntityWithCreateTime {
    public void setAppendixs(String appendixs) {
        this.appendixs = appendixs;
    }
    @Transient
    public String getFollowupStatus() {
        return followupStatus;
    }
    public void setFollowupStatus(String followupStatus) {
        this.followupStatus = followupStatus;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/integrate/BaseHospitalUserActivityController.java

@@ -35,7 +35,12 @@ public class BaseHospitalUserActivityController extends EnvelopRestEndpoint {
                                          @RequestParam(value = "size", required = true) Integer size,
                                      @ApiParam(name = "title", value = "活动标题", required = false)
                                          @RequestParam(value = "title", required = false) String title) {
        return success(userActivityService.selectUserActivityByCondition(title,page,size));
        try {
            return success(userActivityService.selectUserActivityByCondition(title,page,size));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("查询失败");
        }
    }
    @GetMapping(value= BaseHospitalRequestMapping.BaseHospitalUserActivity.findUserActivityById)

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationManageService.java

@@ -1428,13 +1428,13 @@ public class RehabilitationManageService {
                planDO.setGuidanceMessage(list.get(0).get("content")+"");
            }
        }
//        if("1".equals(planDO.getStatus())){
//            String relationCode = planDO.getRelationCode();
//            if("6".equals(planDO.getRelationType())&&StringUtils.isNotBlank(relationCode)){
//                Followup followup = followupDao.findById(Long.parseLong(relationCode)).orElse(null);
//                planDO.setFollowup(followup);
//            }
//        }
        String relationCode = planDO.getRelationCode();
        if("6".equals(planDO.getRelationType())&&StringUtils.isNotBlank(relationCode)){
            Followup followup = followupDao.findById(Long.parseLong(relationCode)).orElse(null);
            if(followup!=null){
                planDO.setFollowupStatus(followup.getStatus());
            }
        }
        return planDO;
    }