|
@ -170,7 +170,7 @@ public class FamilyContractService extends BaseService {
|
|
|
|
|
|
|
|
|
public SignFamily findSignFamilyByCode(String code) {
|
|
|
return signFamilyDao.findByCodeAndType(code, 2);
|
|
|
return signFamilyDao.findByCode(code);
|
|
|
}
|
|
|
|
|
|
public SignFamily findByPatientByType(String patient, int type) {
|
|
@ -826,6 +826,28 @@ public class FamilyContractService extends BaseService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
Patient p = patientDao.findByCode(patient);
|
|
|
|
|
|
// 添加取消签约消息
|
|
|
Message message = new Message();
|
|
|
message.setCzrq(new Date());
|
|
|
message.setCreateTime(new Date());
|
|
|
message.setContent("您有一条新的家庭签约取消通知!");
|
|
|
message.setRead(1);//设置未读
|
|
|
message.setReceiver(doctor);//设置接受医生的code
|
|
|
message.setSender(patient);//设置发送的用户
|
|
|
message.setSenderName(p.getName());
|
|
|
message.setCode(getCode());
|
|
|
message.setSenderPhoto(p.getPhoto());
|
|
|
message.setTitle("家庭签约取消通知");
|
|
|
message.setType(101);//家庭签约取消信息
|
|
|
message.setReadonly(1);//是否只读消息
|
|
|
message.setSex(p.getSex());
|
|
|
message.setOver("1");//未处理
|
|
|
message.setData(sf.getCode());
|
|
|
messageDao.save(message);
|
|
|
|
|
|
return 200;
|
|
|
}
|
|
|
|
|
@ -839,19 +861,12 @@ public class FamilyContractService extends BaseService {
|
|
|
*/
|
|
|
public int unsignRenew(String patient, String doctor) throws Exception {
|
|
|
|
|
|
if (4 < DateUtil.getNowMonth() && DateUtil.getNowMonth() < 7) {
|
|
|
SignFamilyRenew sf = signFamilyRenewDao.findByDoctorPatient(doctor, patient);
|
|
|
if (sf != null && sf.getStatus() != 0 && sf.getStatus() != 2) {
|
|
|
return -2;
|
|
|
}
|
|
|
sf.setStatus(-1);
|
|
|
} else {
|
|
|
SignFamily sf = signFamilyDao.findByDoctorPatient(doctor, patient);
|
|
|
if (sf != null && sf.getStatus() != 0 && sf.getStatus() != 2) {
|
|
|
return -2;
|
|
|
}
|
|
|
sf.setStatus(-1);
|
|
|
SignFamily sf = signFamilyDao.findByDoctorPatient(doctor, patient);
|
|
|
if (sf != null && sf.getStatus() != 0 && sf.getStatus() != 2) {
|
|
|
return -2;
|
|
|
}
|
|
|
sf.setStatus(-1);
|
|
|
sf.setPatientApplyUnsignDate(new Date());
|
|
|
|
|
|
//结束与医生所有消息
|
|
|
List<Message> messages = messageDao.findByPatientRenew(patient, doctor);
|
|
@ -867,6 +882,27 @@ public class FamilyContractService extends BaseService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
Patient p = patientDao.findByCode(patient);
|
|
|
|
|
|
// 添加取消签约消息
|
|
|
Message message = new Message();
|
|
|
message.setCzrq(new Date());
|
|
|
message.setCreateTime(new Date());
|
|
|
message.setContent("您有一条新的家庭签约取消通知!");
|
|
|
message.setRead(1);//设置未读
|
|
|
message.setReceiver(doctor);//设置接受医生的code
|
|
|
message.setSender(patient);//设置发送的用户
|
|
|
message.setSenderName(p.getName());
|
|
|
message.setCode(getCode());
|
|
|
message.setSenderPhoto(p.getPhoto());
|
|
|
message.setTitle("家庭签约取消通知");
|
|
|
message.setType(101);//家庭签约取消信息
|
|
|
message.setReadonly(1);//是否只读消息
|
|
|
message.setSex(p.getSex());
|
|
|
message.setOver("1");//未处理
|
|
|
message.setData(sf.getCode());
|
|
|
messageDao.save(message);
|
|
|
|
|
|
return 200;
|
|
|
}
|
|
|
|
|
@ -3261,7 +3297,8 @@ public class FamilyContractService extends BaseService {
|
|
|
" sp.id labelid, " +
|
|
|
" CASE WHEN sp.label_name is null THEN '未标注' WHEN sp.label_name='' THEN '未标注' else sp.label_name END labelname, " +
|
|
|
" sp.label_type labeltype, " +
|
|
|
" p.idcard idcard " +
|
|
|
" p.idcard idcard ," +
|
|
|
" p.openid" +
|
|
|
" FROM " +
|
|
|
" wlyy_sign_family sf " +
|
|
|
" JOIN wlyy_patient p ON sf.patient = p.CODE " +
|
|
@ -3964,8 +4001,13 @@ public class FamilyContractService extends BaseService {
|
|
|
" f.patient, " +
|
|
|
" f.sign_year, " +
|
|
|
" t.server_type AS serverType, " +
|
|
|
" t.server_type_name AS specialPopulation " +
|
|
|
"FROM " +
|
|
|
" t.server_type_name AS specialPopulation," +
|
|
|
" p.name," +
|
|
|
" p.sex," +
|
|
|
" IFNULL(year( from_days( datediff( now(), p.birthday))),'未知') age," +
|
|
|
" p.photo," +
|
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid" +
|
|
|
" FROM " +
|
|
|
" wlyy_sign_family_server t, " +
|
|
|
" ( " +
|
|
|
" SELECT " +
|
|
@ -3978,9 +4020,11 @@ public class FamilyContractService extends BaseService {
|
|
|
" s.`status` >= 0 " +
|
|
|
" AND s.admin_team_code = " + teamCode +
|
|
|
" AND s.doctor_health IS NULL " +
|
|
|
" ) f " +
|
|
|
"WHERE " +
|
|
|
" t.sign_code = f. CODE ";
|
|
|
" ) f," +
|
|
|
" wlyy_patient p " +
|
|
|
" WHERE " +
|
|
|
" t.sign_code = f. CODE AND " +
|
|
|
" p.code = f.patient ";
|
|
|
List<Map<String, Object>> patientList = jdbcTemplate.queryForList(patientSql);
|
|
|
String totalSql = " SELECT " +
|
|
|
" s.patient" +
|
|
@ -4000,19 +4044,17 @@ public class FamilyContractService extends BaseService {
|
|
|
if (patientList != null) {
|
|
|
for (Map<String, Object> map : serlist) {
|
|
|
String labelCode = (String) map.get("labelCode");
|
|
|
List<Map<String, String>> codes = new ArrayList<>();
|
|
|
List<Map<String, Object>> codes = new ArrayList<>();
|
|
|
Iterator iterator = patientList.iterator();
|
|
|
while (iterator.hasNext()) {
|
|
|
Map<String, Object> p = (Map<String, Object>) iterator.next();
|
|
|
String serverType = p.get("serverType") == null ? "" : ((String) p.get("serverType"));
|
|
|
if (labelCode.equals(serverType)) {
|
|
|
Map<String, String> code = new HashMap<>();
|
|
|
code.put("code", (String) p.get("patient"));
|
|
|
codes.add(code);
|
|
|
codes.add(p);
|
|
|
iterator.remove();
|
|
|
}
|
|
|
}
|
|
|
map.put("codes", codes);
|
|
|
map.put("ps", codes);
|
|
|
map.put("number", (codes != null && codes.size() > 0) ? codes.size() : 0);
|
|
|
}
|
|
|
}
|
|
@ -4024,9 +4066,14 @@ public class FamilyContractService extends BaseService {
|
|
|
|
|
|
public JSONObject getCountryPatientList(Long teamCode) {
|
|
|
String totalSql = " SELECT " +
|
|
|
" s.patient,ifnull(s.sick_village,0) as labelCode" +
|
|
|
" s.patient,ifnull(s.sick_village,0) as labelCode," +
|
|
|
" p.name," +
|
|
|
" p.sex," +
|
|
|
" IFNULL(year( from_days( datediff( now(), p.birthday))),'未知') age," +
|
|
|
" p.photo," +
|
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid " +
|
|
|
" FROM " +
|
|
|
" wlyy_sign_family s " +
|
|
|
" wlyy_sign_family s JOIN wlyy_patient p ON p.code = s.patient" +
|
|
|
" WHERE " +
|
|
|
" s.`status` >= 0 " +
|
|
|
" AND s.admin_team_code = ? " +
|
|
@ -4054,19 +4101,17 @@ public class FamilyContractService extends BaseService {
|
|
|
for (Map<String, Object> map : patientList) {
|
|
|
String labelCode = (String) map.get("labelCode");
|
|
|
if (StringUtils.isNotBlank(labelCode)) {
|
|
|
List<Map<String, String>> codes = new ArrayList<>();
|
|
|
List<Map<String, Object>> codes = new ArrayList<>();
|
|
|
Iterator iterator = totalList.iterator();
|
|
|
while (iterator.hasNext()) {
|
|
|
Map<String, Object> p = (Map<String, Object>) iterator.next();
|
|
|
String lbCode = p.get("labelCode") == null ? "" : ((String) p.get("labelCode"));
|
|
|
if (labelCode.equals(lbCode)) {
|
|
|
Map<String, String> code = new HashMap<>();
|
|
|
code.put("code", (String) p.get("patient"));
|
|
|
codes.add(code);
|
|
|
codes.add(p);
|
|
|
iterator.remove();
|
|
|
}
|
|
|
}
|
|
|
map.put("codes", codes);
|
|
|
map.put("ps", codes);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@ -4076,9 +4121,14 @@ public class FamilyContractService extends BaseService {
|
|
|
|
|
|
public JSONObject getTeamCountryPatientChangeDoctorList(Long teamCode, String level, String oldDoctorCode) {
|
|
|
String totalSql = " SELECT " +
|
|
|
" s.patient,ifnull(s.sick_village,0) as labelCode" +
|
|
|
" s.patient,ifnull(s.sick_village,0) as labelCode," +
|
|
|
" p.name," +
|
|
|
" p.sex," +
|
|
|
" IFNULL(year( from_days( datediff( now(), p.birthday))),'未知') age," +
|
|
|
" p.photo," +
|
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid" +
|
|
|
" FROM " +
|
|
|
" wlyy_sign_family s " +
|
|
|
" wlyy_sign_family s JOIN wlyy_patient p ON p.code = s.patient" +
|
|
|
" WHERE " +
|
|
|
" s.`status` >= 0 " +
|
|
|
" AND s.admin_team_code = ? ";
|
|
@ -4095,7 +4145,7 @@ public class FamilyContractService extends BaseService {
|
|
|
" f.sick_village_name AS label, " +
|
|
|
" COUNT(1) AS number " +
|
|
|
" FROM " +
|
|
|
" wlyy_sign_family f " +
|
|
|
" wlyy_sign_family f JOIN wlyy" +
|
|
|
" WHERE " +
|
|
|
" f.`status` >= 0 " +
|
|
|
" AND f.sick_village IS NOT NULL " +
|
|
@ -4114,19 +4164,17 @@ public class FamilyContractService extends BaseService {
|
|
|
for (Map<String, Object> map : patientList) {
|
|
|
String labelCode = (String) map.get("labelCode");
|
|
|
if (StringUtils.isNotBlank(labelCode)) {
|
|
|
List<Map<String, String>> codes = new ArrayList<>();
|
|
|
List<Map<String, Object>> codes = new ArrayList<>();
|
|
|
Iterator iterator = totalList.iterator();
|
|
|
while (iterator.hasNext()) {
|
|
|
Map<String, Object> p = (Map<String, Object>) iterator.next();
|
|
|
String lbCode = p.get("labelCode") == null ? "" : ((String) p.get("labelCode"));
|
|
|
if (labelCode.equals(lbCode)) {
|
|
|
Map<String, String> code = new HashMap<>();
|
|
|
code.put("code", (String) p.get("patient"));
|
|
|
codes.add(code);
|
|
|
codes.add(p);
|
|
|
iterator.remove();
|
|
|
}
|
|
|
}
|
|
|
map.put("codes", codes);
|
|
|
map.put("ps", codes);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@ -4148,7 +4196,12 @@ public class FamilyContractService extends BaseService {
|
|
|
String patientSql = "SELECT " +
|
|
|
" f.patient, " +
|
|
|
" s.server_type AS serverType, " +
|
|
|
" s.server_type_name AS serverTypeName " +
|
|
|
" s.server_type_name AS serverTypeName, " +
|
|
|
" p.name," +
|
|
|
" p.sex," +
|
|
|
" IFNULL(year( from_days( datediff( now(), p.birthday))),'未知') age," +
|
|
|
" p.photo," +
|
|
|
" CASE WHEN p.openid is null THEN '0' WHEN p.openid='' THEN '0' else 1 END hasopenid " +
|
|
|
" FROM " +
|
|
|
" wlyy_sign_family_server s, " +
|
|
|
"( " +
|
|
@ -4166,7 +4219,7 @@ public class FamilyContractService extends BaseService {
|
|
|
} else {
|
|
|
patientSql = patientSql + " AND s.doctor_health ='" + oldDoctorCode + "'";
|
|
|
}
|
|
|
patientSql = patientSql + " ) f WHERE f.`code` =s.sign_code";
|
|
|
patientSql = patientSql + " ) f,wlyy_patient p WHERE f.`code` =s.sign_code AND p.code = f.patient";
|
|
|
|
|
|
List<Map<String, Object>> patientList = jdbcTemplate.queryForList(patientSql);
|
|
|
String totalSql = " SELECT " +
|
|
@ -4192,19 +4245,17 @@ public class FamilyContractService extends BaseService {
|
|
|
if (patientList != null) {
|
|
|
for (Map<String, Object> map : serlist) {
|
|
|
String labelCode = (String) map.get("labelCode");
|
|
|
List<Map<String, String>> codes = new ArrayList<>();
|
|
|
List<Map<String, Object>> codes = new ArrayList<>();
|
|
|
Iterator iterator = patientList.iterator();
|
|
|
while (iterator.hasNext()) {
|
|
|
Map<String, Object> p = (Map<String, Object>) iterator.next();
|
|
|
String serverType = p.get("serverType") == null ? "" : ((String) p.get("serverType"));
|
|
|
if (labelCode.equals(serverType)) {
|
|
|
Map<String, String> code = new HashMap<>();
|
|
|
code.put("code", (String) p.get("patient"));
|
|
|
codes.add(code);
|
|
|
codes.add(p);
|
|
|
iterator.remove();
|
|
|
}
|
|
|
}
|
|
|
map.put("codes", codes);
|
|
|
map.put("ps", codes);
|
|
|
map.put("number", (codes != null && codes.size() > 0) ? codes.size() : 0);
|
|
|
}
|
|
|
}
|