代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/disease/service/BaseDiseaseHospitalService.java

@@ -111,7 +111,7 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
            condition +=" and header like '%"+header+"%' ";
        }
        if (StringUtils.isNoneBlank(clientId)){
            condition +=" and client_d ='"+clientId+"' ";
            condition +=" and client_id ='"+clientId+"' ";
        }
        List<SmsTemplateDO> list = jdbcTemplate.query(sql+condition+orderBy, new BeanPropertyRowMapper<>(SmsTemplateDO.class));
        String sqlCount ="select COUNT(1) as total from base_sms_template where 1=1 ";

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -6346,11 +6346,11 @@ public class StatisticsEsService {
                String key = entry.getKey();
                String value = entry.getValue();
                JSONArray array01 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "12", "9", SaveModel.timeLevel_ZL, value);//图文复诊
                JSONArray array02 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "16", "16", SaveModel.timeLevel_ZL, value);//视频复诊
                JSONArray array03 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "14", "12", SaveModel.timeLevel_ZL, value);//社区协诊
                JSONArray array04 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "12", "1", SaveModel.timeLevel_ZL, value);//图文咨询
                JSONArray array05 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "16", "17", SaveModel.timeLevel_ZL, value);//视频咨询
                JSONArray array01 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "11", "9", SaveModel.timeLevel_ZL, value);//图文复诊
                JSONArray array02 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "15", "16", SaveModel.timeLevel_ZL, value);//视频复诊
                JSONArray array03 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "13", "12", SaveModel.timeLevel_ZL, value);//社区协诊
                JSONArray array04 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "11", "1", SaveModel.timeLevel_ZL, value);//图文咨询
                JSONArray array05 = monthTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "15", "17", SaveModel.timeLevel_ZL, value);//视频咨询
                //数据处理进行合并相加
                ArrayList<JSONArray> list = new ArrayList<>();
@@ -6371,11 +6371,11 @@ public class StatisticsEsService {
                String key = entry.getKey();
                String value = entry.getValue();
                JSONArray array01 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "12", "9", SaveModel.timeLevel_ZL, value);//图文复诊
                JSONArray array02 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "16", "16", SaveModel.timeLevel_ZL, value);//视频复诊
                JSONArray array03 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "14", "12", SaveModel.timeLevel_ZL, value);//社区协诊
                JSONArray array04 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "12", "1", SaveModel.timeLevel_ZL, value);//图文咨询
                JSONArray array05 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "16", "17", SaveModel.timeLevel_ZL, value);//视频咨询
                JSONArray array01 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "11", "9", SaveModel.timeLevel_ZL, value);//图文复诊
                JSONArray array02 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "15", "16", SaveModel.timeLevel_ZL, value);//视频复诊
                JSONArray array03 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "13", "12", SaveModel.timeLevel_ZL, value);//社区协诊
                JSONArray array04 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "11", "1", SaveModel.timeLevel_ZL, value);//图文咨询
                JSONArray array05 = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "15", "17", SaveModel.timeLevel_ZL, value);//视频咨询
                //数据处理进行合并相加
                ArrayList<JSONArray> list = new ArrayList<>();
@@ -7073,22 +7073,22 @@ public class StatisticsEsService {
        //图文问诊、图文咨询、视频问诊、视频咨询、社区协诊=患者支付的属于该类型的诊查费
        //药品费
        double ypFee = findResult1BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
        double ypFee = findResult2BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
                qvo.getLevel(), index3, SaveModel.timeLevel_ZL, null, null, null,lowLevel);
        //上一个周期
        double ypFee_l1 = findResult1BySaveModelList(period[0], period[1], qvo.getArea(),
        double ypFee_l1 = findResult2BySaveModelList(period[0], period[1], qvo.getArea(),
                qvo.getLevel(), index3, SaveModel.timeLevel_ZL, null, null, null,lowLevel);
        //去年同期
        double ypFee_l2 = findResult1BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
        double ypFee_l2 = findResult2BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
                qvo.getLevel(), index3, SaveModel.timeLevel_ZL, null, null, null,lowLevel);
        //诊查费
        double zcFee = findResult1BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
        double zcFee = findResult2BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, null, null, null,lowLevel);
        //上一个周期
        double zcFee_l1 = findResult1BySaveModelList(period[0], period[1], qvo.getArea(),
        double zcFee_l1 = findResult2BySaveModelList(period[0], period[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, null, null, null,lowLevel);
        //去年同期
        double zcFee_l2 = findResult1BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
        double zcFee_l2 = findResult2BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, null, null, null,lowLevel);
        //总收入
        double totalFee = ypFee+zcFee;
@@ -7096,49 +7096,49 @@ public class StatisticsEsService {
        double totalFee_l2 = ypFee_l2+zcFee_l2;
        //图文问诊
        double ppFee = findResult1BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
        double ppFee = findResult2BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "1", "1", null,lowLevel);
        //上一个周期
        double ppFee_l1 = findResult1BySaveModelList(period[0], period[1], qvo.getArea(),
        double ppFee_l1 = findResult2BySaveModelList(period[0], period[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "1", "1", null,lowLevel);
        //去年同期
        double ppFee_l2 = findResult1BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
        double ppFee_l2 = findResult2BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "1", "1", null,lowLevel);
        //图文咨询
        double pcFee = findResult1BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
        double pcFee = findResult2BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "3", "1", null,lowLevel);
        //上一个周期
        double pcFee_l1 = findResult1BySaveModelList(period[0], period[1], qvo.getArea(),
        double pcFee_l1 = findResult2BySaveModelList(period[0], period[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "3", "1", null,lowLevel);
        //去年同期
        double pcFee_l2 = findResult1BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
        double pcFee_l2 = findResult2BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "3", "1", null,lowLevel);
        //视频问诊
        double vpFee = findResult1BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
        double vpFee = findResult2BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "1", "2", null,lowLevel);
        //上一个周期
        double vpFee_l1 = findResult1BySaveModelList(period[0], period[1], qvo.getArea(),
        double vpFee_l1 = findResult2BySaveModelList(period[0], period[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "1", "2", null,lowLevel);
        //去年同期
        double vpFee_l2 = findResult1BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
        double vpFee_l2 = findResult2BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "1", "2", null,lowLevel);
        //视频咨询
        double vcFee = findResult1BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
        double vcFee = findResult2BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "3", "2", null,lowLevel);
        //上一个周期
        double vcFee_l1 = findResult1BySaveModelList(period[0], period[1], qvo.getArea(),
        double vcFee_l1 = findResult2BySaveModelList(period[0], period[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "3", "2", null,lowLevel);
        //去年同期
        double vcFee_l2 = findResult1BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
        double vcFee_l2 = findResult2BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "3", "2", null,lowLevel);
        //社区协诊
        double sxFee = findResult1BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
        double sxFee = findResult2BySaveModelList(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "2", null, null,lowLevel);
        //上一个周期
        double sxFee_l1 = findResult1BySaveModelList(period[0], period[1], qvo.getArea(),
        double sxFee_l1 = findResult2BySaveModelList(period[0], period[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "2", null, null,lowLevel);
        //去年同期
        double sxFee_l2 = findResult1BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
        double sxFee_l2 = findResult2BySaveModelList(periodYear[0], periodYear[1], qvo.getArea(),
                qvo.getLevel(), index21, SaveModel.timeLevel_ZL, "2", null, null,lowLevel);

svr/svr-internet-hospital/pom.xml

@@ -286,7 +286,7 @@
    </dependencies>
    <build>
        <finalName>svr-internet-hospital</finalName>
        <finalName>svr-internet-hospital-test</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/specialist/BaseDiseaseHospitalController.java

@@ -74,8 +74,8 @@ public class BaseDiseaseHospitalController extends EnvelopRestEndpoint {
                doctor = getUID();
            }
            String templateCode = "";
            String sql = "SELECT GROUP_CONCAT(survey_code) survey_code from base_disease_survey";
            sql += " where doctor like '%"+doctor+"%' ";
            String sql = "SELECT GROUP_CONCAT(DISTINCT survey_code) survey_code from base_disease_survey where status=1 ";
            sql += " and doctor like '%"+doctor+"%' ";
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            if(list.size()>0){
                templateCode = list.get(0).get("survey_code")+"";
@@ -105,9 +105,9 @@ public class BaseDiseaseHospitalController extends EnvelopRestEndpoint {
    ) {
        try {
            if(StringUtils.isBlank(templateCode)){
                String sql = "SELECT GROUP_CONCAT(survey_code) survey_code from base_disease_survey";
                String sql = "SELECT GROUP_CONCAT(DISTINCT survey_code) survey_code from base_disease_survey where status=1 ";
                if("0".equals(isManager)){
                    sql += " where doctor like '%"+getUID()+"%' ";
                    sql += " and doctor like '%"+getUID()+"%' ";
                }
                List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
                if(list.size()>0){

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

@@ -1160,7 +1160,7 @@ public class RehabilitationInfoService {
        }
        if (StringUtils.isNotBlank(idcard) && !"null".equals(idcard)) {
            //康复计划状态 [0已中止，1进行中，2已完成]
            sql += " AND a.idcard like'%" + idcard + "%'";
            sql += " AND (a.idcard like'%" + idcard + "%' or a.name like '%"+idcard+"%') ";
        }
        sql += " )q WHERE 1=1  ";