trick9191 7 سال پیش
والد
کامیت
089f8a1d59

+ 3 - 3
patient-co-service/wlyy_device/src/main/resources/application.yml

@ -66,9 +66,9 @@ systemConfig:
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.85/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: linzhou
    password: linzhou
    url: jdbc:mysql://172.17.110.160/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
    driverClassName: com.mysql.jdbc.Driver
    maxTotal: 500
    maxIdle: 30

+ 8 - 8
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/scheme/DoctorSchemeService.java

@ -681,7 +681,7 @@ public class DoctorSchemeService extends BaseService{
                " i.type = '1' " +
                " AND i.del = '1' " +
                " AND i.value2 in(1,3,5,7) " +
                " AND i.value1 <= 4 " +
                " AND i.value1 < 4 " +
                " AND i.record_date >='"+startDate+"'" +
                " AND i.record_date <='"+endDate+"'" +
                " AND i.user ='"+patient+"'" +
@ -695,7 +695,7 @@ public class DoctorSchemeService extends BaseService{
                " i.type = '1' " +
                " AND i.del = '1' " +
                " AND i.value2 in(2,4,6) " +
                " AND i.value1 <= 4 " +
                " AND i.value1 < 4 " +
                " AND i.record_date >='"+startDate+"'" +
                " AND i.record_date <='"+endDate+"'" +
                " AND i.user ='"+patient+"'" +
@ -708,7 +708,7 @@ public class DoctorSchemeService extends BaseService{
                " WHERE " +
                " i.del = '1' " +
                " AND i.type = '2' " +
                " AND i.value1 >= 139 " +
                " AND i.value1 > 139 " +
                " AND i.record_date >='"+startDate+"'" +
                " AND i.record_date <='"+endDate+"'" +
                " AND i.user ='"+patient+"'";
@ -731,7 +731,7 @@ public class DoctorSchemeService extends BaseService{
                " WHERE " +
                " i.del = '1' " +
                " AND i.type = '2' " +
                " AND i.value1 <= 90 " +
                " AND i.value1 < 90 " +
                " AND i.record_date >='"+startDate+"'" +
                " AND i.record_date <='"+endDate+"'" +
                " AND i.user ='"+patient+"'";
@ -862,7 +862,7 @@ public class DoctorSchemeService extends BaseService{
                " i.type = '1' " +
                " AND i.del = '1' " +
                " AND i.value2 in(1,3,5,7) " +
                " AND i.value1 <= 4 " +
                " AND i.value1 < 4 " +
                " AND i.record_date >='"+startDate+"'" +
                " AND i.record_date <='"+endDate+"'" +
                " AND i.user IN (SELECT t.patient_code FROM wlyy.wlyy_track_patient t WHERE t.del='1' AND t.doctor_code ='"+doctor+"' AND t.team_code = " +teamCode+")" +
@ -876,7 +876,7 @@ public class DoctorSchemeService extends BaseService{
                " i.type = '1' " +
                " AND i.del = '1' " +
                " AND i.value2 in(2,4,6) " +
                " AND i.value1 <= 4 " +
                " AND i.value1 < 4 " +
                " AND i.record_date >='"+startDate+"'" +
                " AND i.record_date <='"+endDate+"'" +
                " AND i.user IN (SELECT t.patient_code FROM wlyy.wlyy_track_patient t WHERE t.del='1' AND t.doctor_code ='"+doctor+"' AND t.team_code = " +teamCode+")" +
@ -889,7 +889,7 @@ public class DoctorSchemeService extends BaseService{
                " WHERE " +
                " i.del = '1' " +
                " AND i.type = '2' " +
                " AND i.value1 >= 139 " +
                " AND i.value1 > 139 " +
                " AND i.record_date >='"+startDate+"'" +
                " AND i.record_date <='"+endDate+"'" +
                " AND i.user IN (SELECT t.patient_code FROM wlyy.wlyy_track_patient t WHERE t.del='1' AND t.doctor_code ='"+doctor+"' AND t.team_code = " +teamCode+")";
@ -912,7 +912,7 @@ public class DoctorSchemeService extends BaseService{
                " WHERE " +
                " i.del = '1' " +
                " AND i.type = '2' " +
                " AND i.value1 <= 90 " +
                " AND i.value1 < 90 " +
                " AND i.record_date >='"+startDate+"'" +
                " AND i.record_date <='"+endDate+"'" +
                " AND i.user IN (SELECT t.patient_code FROM wlyy.wlyy_track_patient t WHERE t.del='1' AND t.doctor_code ='"+doctor+"' AND t.team_code = " +teamCode+")";

+ 10 - 10
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@ -2677,21 +2677,21 @@ public class SignWebService extends BaseService {
            //获取智业团队签约上线
            String jwCode = one.getMappingCode();//智业服务团队的code
            try{
                String response = jwSignService.getSickFamilyDoctorSignLimit(jwCode);
                com.alibaba.fastjson.JSONObject json = com.alibaba.fastjson.JSONObject.parseObject(response);
                if(json.getInteger("status")==200){
                    com.alibaba.fastjson.JSONObject data = json.getJSONObject("data");
                    if("1".equals(data.getString("CODE"))&&data.getJSONArray("DATA").size()>0){
                        int sign_limit_number = data.getJSONArray("DATA").getJSONObject(0).getInteger("SIGN_LIMIT_NUMBER");//签约上线
                        limitTotal+=sign_limit_number;
                    }
                }
//                String response = jwSignService.getSickFamilyDoctorSignLimit(jwCode);
//                com.alibaba.fastjson.JSONObject json = com.alibaba.fastjson.JSONObject.parseObject(response);
//                if(json.getInteger("status")==200){
//                    com.alibaba.fastjson.JSONObject data = json.getJSONObject("data");
//                    if("1".equals(data.getString("CODE"))&&data.getJSONArray("DATA").size()>0){
//                        int sign_limit_number = data.getJSONArray("DATA").getJSONObject(0).getInteger("SIGN_LIMIT_NUMBER");//签约上线
//                        limitTotal+=sign_limit_number;
//                    }
//                }
            }catch (Exception e){
                e.printStackTrace();
            }
        }
        re.put("signTotal",signTotal);
        re.put("limitTotal",limitTotal);
        re.put("limitTotal",1500);
        return re;
    }