wangzhinan 9 місяців тому
батько
коміт
db4e97886e

+ 3 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/survey/service/SurveyService.java

@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*;
import java.util.*;
/**
/**
@ -813,7 +814,8 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
                        if (answerDOs != null && answerDOs.size() > 0) {
                        if (answerDOs != null && answerDOs.size() > 0) {
                            answerCount = answerDOs.size();
                            answerCount = answerDOs.size();
                        }
                        }
                        vo.setPercentage(PercentageUtil.bs(answerCount, total) + "%");
                        DecimalFormat df = new DecimalFormat("0.00");
                        vo.setPercentage(df.format(PercentageUtil.bs(answerCount, total))+ "%");
                        vo.setOptCount(answerCount);
                        vo.setOptCount(answerCount);
                        vo.setId(vo.getCode());
                        vo.setId(vo.getCode());
                    }
                    }

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

@ -960,7 +960,7 @@ public class RehabilitationInfoService {
        String limitSql = " LIMIT " + (page - 1) * pagesize + "," + pagesize;
        String limitSql = " LIMIT " + (page - 1) * pagesize + "," + pagesize;
        String filterSql = "";
        String filterSql = "";
        if (StringUtils.isNotBlank(idcard)) {
        if (StringUtils.isNotBlank(idcard)) {
            filterSql += " and d.idcard='" + idcard + "' ";
            filterSql += " and (d.idcard='" + idcard + "' || d.name like '%"+idcard+"%' ) ";
        }
        }
        if (StringUtils.isNotBlank(downPatientId)) {
        if (StringUtils.isNotBlank(downPatientId)) {
            //wlyy_rehabilitation_patient_info的id
            //wlyy_rehabilitation_patient_info的id