|
@ -170,13 +170,16 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
json.put("jtAdminTeam", familySign.getAdminTeamId());
|
|
|
json.put("jtHospital", familySign.getHospital());
|
|
|
json.put("jtHospitalName", familySign.getHospitalName());
|
|
|
if(StringUtils.isNotBlank(familySign.getSpecialPopulation())){
|
|
|
json.put("jtServerName", familySign.getSpecialPopulationName()==null?"":familySign.getSpecialPopulationName());
|
|
|
json.put("jtServer", familySign.getSpecialPopulation()==null?"":familySign.getServerType()+"-"+familySign.getSpecialPopulation());
|
|
|
}else{
|
|
|
json.put("jtServerName", familySign.getServerTypeName()==null?"":familySign.getServerTypeName());
|
|
|
json.put("jtServer", familySign.getServerType()==null?"":familySign.getServerType());
|
|
|
}
|
|
|
|
|
|
List<Map<String,Object>> signTypes = jdbcTemplate.queryForList("SELECT s.server_type_name,s.server_type FROM wlyy_sign_family_server s WHERE s.sign_code ='"+familySign.getCode()+"'");
|
|
|
json.put("serverTypes",signTypes);
|
|
|
// if(StringUtils.isNotBlank(familySign.getSpecialPopulation())){
|
|
|
// json.put("jtServerName", familySign.getSpecialPopulationName()==null?"":familySign.getSpecialPopulationName());
|
|
|
// json.put("jtServer", familySign.getSpecialPopulation()==null?"":familySign.getServerType()+"-"+familySign.getSpecialPopulation());
|
|
|
// }else{
|
|
|
// json.put("jtServerName", familySign.getServerTypeName()==null?"":familySign.getServerTypeName());
|
|
|
// json.put("jtServer", familySign.getServerType()==null?"":familySign.getServerType());
|
|
|
// }
|
|
|
|
|
|
|
|
|
if ("1".equals(familySign.getExpensesStatus())) {
|