|
@ -1734,22 +1734,22 @@ public class FamilyContractService extends BaseService {
|
|
" WHERE " +
|
|
" WHERE " +
|
|
" sf.type = 2 " +
|
|
" sf.type = 2 " +
|
|
" AND sf. STATUS >= 0 " +
|
|
" AND sf. STATUS >= 0 " +
|
|
" and sf.doctor = ? "+
|
|
|
|
" AND ( sf.doctor_health is null or sf.doctor_health ='' ) ) a where 1=1" ;
|
|
|
|
if(!org.springframework.util.StringUtils.isEmpty(patientAddr)){
|
|
|
|
sql+= " AND a.address like '%"+patientAddr+"%'";
|
|
|
|
}
|
|
|
|
if(!org.springframework.util.StringUtils.isEmpty(patientName)){
|
|
|
|
sql+= " AND a.name like '%"+patientName+"%'";
|
|
|
|
}
|
|
|
|
List<Map<String, Object>> datas = jdbcTemplate.queryForList(sql, doctorCode );
|
|
|
|
if(datas!=null&&datas.size()>0){
|
|
|
|
for(Map<String, Object> map:datas){
|
|
|
|
JSONObject jo=new JSONObject();
|
|
|
|
jo.put("signcode",map.get("signcode"));
|
|
|
|
jo.put("name",map.get("name"));
|
|
|
|
jo.put("code",map.get("code"));
|
|
|
|
jo.put("hasopenid",map.get("hasopenid"));
|
|
|
|
|
|
" and sf.doctor = ? " +
|
|
|
|
" AND ( sf.doctor_health is null or sf.doctor_health ='' ) ) a where 1=1";
|
|
|
|
if (!org.springframework.util.StringUtils.isEmpty(patientAddr)) {
|
|
|
|
sql += " AND a.address like '%" + patientAddr + "%'";
|
|
|
|
}
|
|
|
|
if (!org.springframework.util.StringUtils.isEmpty(patientName)) {
|
|
|
|
sql += " AND a.name like '%" + patientName + "%'";
|
|
|
|
}
|
|
|
|
List<Map<String, Object>> datas = jdbcTemplate.queryForList(sql, doctorCode);
|
|
|
|
if (datas != null && datas.size() > 0) {
|
|
|
|
for (Map<String, Object> map : datas) {
|
|
|
|
JSONObject jo = new JSONObject();
|
|
|
|
jo.put("signcode", map.get("signcode"));
|
|
|
|
jo.put("name", map.get("name"));
|
|
|
|
jo.put("code", map.get("code"));
|
|
|
|
jo.put("hasopenid", map.get("hasopenid"));
|
|
jo.put("age", IdCardUtil.getAgeForIdcard(map.get("idcard").toString()));
|
|
jo.put("age", IdCardUtil.getAgeForIdcard(map.get("idcard").toString()));
|
|
jo.put("sex", IdCardUtil.getSexForIdcard_new(map.get("idcard").toString()));
|
|
jo.put("sex", IdCardUtil.getSexForIdcard_new(map.get("idcard").toString()));
|
|
returnMap.put(jo);
|
|
returnMap.put(jo);
|
|
@ -1757,7 +1757,8 @@ public class FamilyContractService extends BaseService {
|
|
}
|
|
}
|
|
return returnMap;
|
|
return returnMap;
|
|
}
|
|
}
|
|
public JSONObject findNoHealthSignFamilyHealth(String doctorCode, String labelType, String patientName) throws Exception{
|
|
|
|
|
|
|
|
|
|
public JSONObject findNoHealthSignFamilyHealth(String doctorCode, String labelType, String patientName) throws Exception {
|
|
JSONObject returnMap = new JSONObject();
|
|
JSONObject returnMap = new JSONObject();
|
|
//健康管理师
|
|
//健康管理师
|
|
String sql = "SELECT " +
|
|
String sql = "SELECT " +
|
|
@ -1766,21 +1767,21 @@ public class FamilyContractService extends BaseService {
|
|
" p.code code, " +
|
|
" p.code code, " +
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid, " +
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid, " +
|
|
" sp.id labelid, " +
|
|
" sp.id labelid, " +
|
|
" CASE WHEN sp.label_name is null THEN '未标注' WHEN sp.label_name='' THEN '未标注' else sp.label_name END labelname, "+
|
|
|
|
|
|
" CASE WHEN sp.label_name is null THEN '未标注' WHEN sp.label_name='' THEN '未标注' else sp.label_name END labelname, " +
|
|
" sp.label_type labeltype, " +
|
|
" sp.label_type labeltype, " +
|
|
" p.idcard idcard " +
|
|
" p.idcard idcard " +
|
|
" FROM " +
|
|
|
|
|
|
" FROM " +
|
|
" wlyy_sign_family sf " +
|
|
" wlyy_sign_family sf " +
|
|
" JOIN wlyy_patient p ON sf.patient = p.CODE " +
|
|
" JOIN wlyy_patient p ON sf.patient = p.CODE " +
|
|
" left JOIN wlyy_sign_patient_label_info sp ON sf.patient = sp.patient AND sp.label_type = ? AND sp.`status` = 1 " +
|
|
" left JOIN wlyy_sign_patient_label_info sp ON sf.patient = sp.patient AND sp.label_type = ? AND sp.`status` = 1 " +
|
|
" WHERE " +
|
|
|
|
|
|
" WHERE " +
|
|
" sf.type = 2 " +
|
|
" sf.type = 2 " +
|
|
" AND sf. STATUS >= 0 " +
|
|
" AND sf. STATUS >= 0 " +
|
|
" and sf.doctor = ? "+
|
|
|
|
" AND ( sf.doctor_health is null or sf.doctor_health ='' ) " ;
|
|
|
|
|
|
" and sf.doctor = ? " +
|
|
|
|
" AND ( sf.doctor_health is null or sf.doctor_health ='' ) ";
|
|
List<Map<String, Object>> datas = null;
|
|
List<Map<String, Object>> datas = null;
|
|
//查找居民
|
|
//查找居民
|
|
datas = jdbcTemplate.queryForList(sql,labelType , doctorCode );
|
|
|
|
|
|
datas = jdbcTemplate.queryForList(sql, labelType, doctorCode);
|
|
|
|
|
|
//根据类别查找标签
|
|
//根据类别查找标签
|
|
List<SignPatientLabel> s = labelDao.findByLabelTypeAndStatus(labelType, 1);
|
|
List<SignPatientLabel> s = labelDao.findByLabelTypeAndStatus(labelType, 1);
|
|
@ -1790,11 +1791,11 @@ public class FamilyContractService extends BaseService {
|
|
}
|
|
}
|
|
if (datas != null && datas.size() > 0) {
|
|
if (datas != null && datas.size() > 0) {
|
|
for (Map<String, Object> map : datas) {
|
|
for (Map<String, Object> map : datas) {
|
|
JSONObject jo=new JSONObject();
|
|
|
|
jo.put("signcode",map.get("signcode"));
|
|
|
|
jo.put("name",map.get("name"));
|
|
|
|
jo.put("code",map.get("code"));
|
|
|
|
jo.put("hasopenid",map.get("hasopenid"));
|
|
|
|
|
|
JSONObject jo = new JSONObject();
|
|
|
|
jo.put("signcode", map.get("signcode"));
|
|
|
|
jo.put("name", map.get("name"));
|
|
|
|
jo.put("code", map.get("code"));
|
|
|
|
jo.put("hasopenid", map.get("hasopenid"));
|
|
jo.put("age", IdCardUtil.getAgeForIdcard(map.get("idcard").toString()));
|
|
jo.put("age", IdCardUtil.getAgeForIdcard(map.get("idcard").toString()));
|
|
jo.put("sex", IdCardUtil.getSexForIdcard_new(map.get("idcard").toString()));
|
|
jo.put("sex", IdCardUtil.getSexForIdcard_new(map.get("idcard").toString()));
|
|
JSONArray jr = returnMap.getJSONArray(map.get("labelname").toString());
|
|
JSONArray jr = returnMap.getJSONArray(map.get("labelname").toString());
|
|
@ -2054,7 +2055,7 @@ public class FamilyContractService extends BaseService {
|
|
return returnMap;
|
|
return returnMap;
|
|
}
|
|
}
|
|
|
|
|
|
public JSONObject getPatientByLable(String doctorCode, String labelType,String level) throws Exception {
|
|
|
|
|
|
public JSONObject getPatientByLable(String doctorCode, String labelType, String level) throws Exception {
|
|
JSONObject returnMap = new JSONObject();
|
|
JSONObject returnMap = new JSONObject();
|
|
Doctor doctor = doctorDao.findByCode(doctorCode);
|
|
Doctor doctor = doctorDao.findByCode(doctorCode);
|
|
//判断当前用户是健康管理师还是全科
|
|
//判断当前用户是健康管理师还是全科
|
|
@ -2068,7 +2069,7 @@ public class FamilyContractService extends BaseService {
|
|
" p.code code, " +
|
|
" p.code code, " +
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid, " +
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid, " +
|
|
" sp.id labelid, " +
|
|
" sp.id labelid, " +
|
|
" CASE WHEN sp.label_name is null THEN '未标注' WHEN sp.label_name='' THEN '未标注' else sp.label_name END labelname, "+
|
|
|
|
|
|
" CASE WHEN sp.label_name is null THEN '未标注' WHEN sp.label_name='' THEN '未标注' else sp.label_name END labelname, " +
|
|
" sp.label_type labeltype, " +
|
|
" sp.label_type labeltype, " +
|
|
" p.idcard idcard " +
|
|
" p.idcard idcard " +
|
|
" FROM " +
|
|
" FROM " +
|
|
@ -2091,7 +2092,7 @@ public class FamilyContractService extends BaseService {
|
|
" p.code code, " +
|
|
" p.code code, " +
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid, " +
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid, " +
|
|
" sp.id labelid, " +
|
|
" sp.id labelid, " +
|
|
" CASE WHEN sp.label_name is null THEN '未标注' WHEN sp.label_name='' THEN '未标注' else sp.label_name END labelname, "+
|
|
|
|
|
|
" CASE WHEN sp.label_name is null THEN '未标注' WHEN sp.label_name='' THEN '未标注' else sp.label_name END labelname, " +
|
|
" sp.label_type labeltype, " +
|
|
" sp.label_type labeltype, " +
|
|
" p.idcard idcard " +
|
|
" p.idcard idcard " +
|
|
" FROM " +
|
|
" FROM " +
|
|
@ -2117,19 +2118,19 @@ public class FamilyContractService extends BaseService {
|
|
}
|
|
}
|
|
if (datas != null && datas.size() > 0) {
|
|
if (datas != null && datas.size() > 0) {
|
|
for (Map<String, Object> map : datas) {
|
|
for (Map<String, Object> map : datas) {
|
|
JSONObject jo=new JSONObject();
|
|
|
|
jo.put("signcode",map.get("signcode"));
|
|
|
|
jo.put("name",map.get("name"));
|
|
|
|
jo.put("photo",map.get("photo"));
|
|
|
|
jo.put("code",map.get("code"));
|
|
|
|
jo.put("hasopenid",map.get("hasopenid"));
|
|
|
|
|
|
JSONObject jo = new JSONObject();
|
|
|
|
jo.put("signcode", map.get("signcode"));
|
|
|
|
jo.put("name", map.get("name"));
|
|
|
|
jo.put("photo", map.get("photo"));
|
|
|
|
jo.put("code", map.get("code"));
|
|
|
|
jo.put("hasopenid", map.get("hasopenid"));
|
|
jo.put("age", IdCardUtil.getAgeForIdcard(map.get("idcard").toString()));
|
|
jo.put("age", IdCardUtil.getAgeForIdcard(map.get("idcard").toString()));
|
|
jo.put("sex", IdCardUtil.getSexForIdcard_new(map.get("idcard").toString()));
|
|
jo.put("sex", IdCardUtil.getSexForIdcard_new(map.get("idcard").toString()));
|
|
//判断name是否为空 为空就是未标注
|
|
//判断name是否为空 为空就是未标注
|
|
//把患者添加到对应的组
|
|
//把患者添加到对应的组
|
|
JSONArray jr = returnMap.getJSONArray(map.get("labelname").toString());
|
|
|
|
if (jr == null) {
|
|
|
|
jr = new JSONArray();
|
|
|
|
|
|
JSONArray jr = new JSONArray();
|
|
|
|
if (returnMap.has(map.get("labelname").toString())) {
|
|
|
|
jr = returnMap.getJSONArray(map.get("labelname").toString());
|
|
}
|
|
}
|
|
jr.put(jo);
|
|
jr.put(jo);
|
|
returnMap.put(map.get("labelname").toString(), jr);
|
|
returnMap.put(map.get("labelname").toString(), jr);
|