|
|
@ -717,7 +717,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
|
|
|
if (StringUtils.isNotBlank(doctor)) {//日常监护医生必传
|
|
|
fliter += " and EXISTS( SELECT 1 " +
|
|
|
" from base_service_package_sign_record sr,base_service_package_record r,base_team_member m " +
|
|
|
" WHERE ord.id = CONVERT(sr.patient USING utf8) and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id " +
|
|
|
" WHERE ord.patient = CONVERT(sr.patient USING utf8) and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id " +
|
|
|
" and m.doctor_code = '" + doctor + "' and m.del = '1' ) ";
|
|
|
|
|
|
fliter += " and EXISTS (select 1 from wlyy_patient_device pd INNER JOIN dm_device dd on pd.device_id = dd.id " +
|
|
|
@ -1675,7 +1675,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
|
|
|
if (XY.size()!= 0) {
|
|
|
for (Map<String, Object> map : XY) {
|
|
|
//HealthIndexUtil.verifyHealthIndex
|
|
|
JSONArray jsonArray = healthIndexUtil.verifyHealthIndex(2, map.get("value1").toString(), map.get("value2").toString(), map.get("value3").toString());
|
|
|
JSONArray jsonArray = healthIndexUtil.verifyHealthIndex(2, null==map.get("value1")?"":map.get("value1").toString(), null==map.get("value2")?"":map.get("value2").toString(), null==map.get("value3")?"":map.get("value3").toString());
|
|
|
if(jsonArray.size()==0){
|
|
|
map.put("value1Index","");
|
|
|
map.put("value2Index","");
|
|
|
@ -1696,7 +1696,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
|
|
|
|
|
|
if (XT.size()!= 0) {
|
|
|
for (Map<String, Object> map : XT) {
|
|
|
JSONArray jsonArray = healthIndexUtil.verifyHealthIndex(1, map.get("value1").toString(), map.get("value2").toString());
|
|
|
JSONArray jsonArray = healthIndexUtil.verifyHealthIndex(1, null==map.get("value1")?"":map.get("value1").toString(), null==map.get("value2")?"":map.get("value2").toString());
|
|
|
if(jsonArray.size()==0){
|
|
|
map.put("value1Index","");
|
|
|
}else {
|
