Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

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

@@ -2673,7 +2673,7 @@ public class StatisticsEsService {
    /**
     * 按月统计 折线图
     * 按月统计 折线图 从1号开始
     *
     * @param startDate
     * @param endDate
@@ -2691,6 +2691,7 @@ public class StatisticsEsService {
        // 起始日期
        Calendar start = Calendar.getInstance();
        start.setTime(DateUtil.strToDate(startDate, DateUtil.YYYY_MM_DD));
        start.set(Calendar.DAY_OF_MONTH,1);
        // 结束日期
        Calendar end = Calendar.getInstance();
        //因为统计时间是统计到当前时间的前一天，所以这里的时间是提前一天
@@ -2698,6 +2699,7 @@ public class StatisticsEsService {
        temp.setTime(DateUtil.strToDate(endDate, DateUtil.YYYY_MM_DD));
//        temp.add(Calendar.DAY_OF_MONTH, -1);
        end.setTime(temp.getTime());
        end.set(Calendar.DAY_OF_MONTH,1);
        // 日期集合
        List<Calendar> days = new ArrayList<>();

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/common/service/LabelService.java

@@ -85,13 +85,15 @@ public class LabelService {
                                sign.setSignSource(json.getString("sign_source"));
                                sign.setDiseaseCondition(json.getString("disease_condition"));
                                sign.setAdminTeamId(json.getString("admin_team_id"));
                                BasePatientDO patientDO = patientDao.findByIdcard(sign.getIdcard());
                                if(patientDO!=null){
                                    if(sign.getPatient()==null){
                                        sign.setPatient(patientDO.getId());
                                if(StringUtils.isNotBlank(sign.getDiseaseCondition())){
                                    BasePatientDO patientDO = patientDao.findByIdcard(sign.getIdcard());
                                    if(patientDO!=null){
                                        if(sign.getPatient()==null){
                                            sign.setPatient(patientDO.getId());
                                        }
                                        patientDO.setDiseaseCondition(Integer.parseInt(sign.getDiseaseCondition()));
                                        patientDao.save(patientDO);
                                    }
                                    patientDO.setDiseaseCondition(Integer.parseInt(sign.getDiseaseCondition()));
                                    patientDao.save(patientDO);
                                }
                                jsonArray.remove(i);
                                break;

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

@@ -1090,7 +1090,7 @@ public class RehabilitationInfoService {
        String limitSql = " LIMIT " + (page - 1) * pagesize + "," + pagesize;
        String sql = "SELECT * FROM ( " +
                "SELECT DISTINCT  " +
                "	 a.idcard,a.id,a.`name`,a.birthday,a.phone,a.sex,a.mobile,TIMESTAMPDIFF(YEAR,a.birthday,NOW()) 'age', " +
                "	 a.idcard,a.photo,a.id,a.`name`,a.birthday,a.phone,a.sex,a.mobile,TIMESTAMPDIFF(YEAR,a.birthday,NOW()) 'age', " +
                "	   ( " +
                "		SELECT GROUP_CONCAT(q.`name`) FROM base_disease_hospital q  " +
                "        INNER JOIN wlyy_patient_rehabilitation_plan w ON q.id = w.disease  " +
@@ -1241,7 +1241,7 @@ public class RehabilitationInfoService {
                "	 a.id,a.`name`,a.birthday,a.phone,a.sex,a.mobile,TIMESTAMPDIFF(YEAR,a.birthday,NOW()) 'age',a.idcard, " +
                "	 b.id 'planId',b.title 'planTitle',b.plan_doctor 'planDoctor',b.plan_doctor_name 'planDoctorName'" +
                ",d. `name` 'diseaseName',c.dept_name 'deptName', " +
                "	 b.`status` 'planStatus', c.hospital_name 'hospitalName',b.medical_records_code medicalRecordsCode," +
                "	 b.`status` 'planStatus', '厦门市第三医院' 'hospitalName',b.medical_records_code medicalRecordsCode," +
                "    c.from_source, " +
                "       CASE   " +
                "        WHEN c.from_source='1' THEN '手动添加' " +
@@ -1271,6 +1271,7 @@ public class RehabilitationInfoService {
        if (StringUtils.isNotBlank(diseaseId)) {
            sql += "	AND d.id='" + diseaseId + "' ";
        }
        sql += " order by b.create_time desc ";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);