Merge branch 'dev' of zd_123/patient-co-management into dev

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/PrescriptionDiseaseConvert.java

@@ -52,7 +52,10 @@ public class PrescriptionDiseaseConvert implements Convert {
                "  health_problem AS healthProblem ," +
                "  prescription_code AS prescriptionCode " +
                "  FROM " +
                "  wlyy_prescription_diagnosis ";
                "  wlyy_prescription_diagnosis "+
                "WHERE " +
                "p.`code`=d.prescription_code AND p.status=100 ";
        List<Map<String, Object>> diagnosisList = jdbcTemplate.queryForList(sql);
        for (Map<String, Object> map : diagnosisList) {
            String key = (String) map.get("prescriptionCode");

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/PrescriptionPatientDiseaseConvert.java

@@ -52,8 +52,9 @@ public class PrescriptionPatientDiseaseConvert implements Convert {
                "  wlyy_prescription p, " +
                "  wlyy_prescription_diagnosis d " +
                "WHERE " +
                "p.`code`=d.prescription_code" ;
                "p.`code`=d.prescription_code AND p.status=100 ";
        List<Map<String, Object>> diagnosisList = jdbcTemplate.queryForList(sql);
        for (Map<String, Object> map : diagnosisList) {
            String key= (String) map.get("patient");
            List<String> healthProblemList=returnMap.get(key);