Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doctor/admin/AdminListInfoController.java

@@ -14,7 +14,6 @@ import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -137,7 +136,7 @@ public class AdminListInfoController extends EnvelopRestEndpoint {
                                              @ApiParam(name="patientName",value = "患者姓名/身份证")
                                              @RequestParam(value = "patientName",required = false) String patientName,
                                              @ApiParam(name="doctor",value = "查看医生")
                                              @RequestParam(value = "doctor",required = true) String doctor,
                                              @RequestParam(value = "doctor",required = false) String doctor,
                                              @ApiParam(name="status",value = "工单状态-2误报警-1已取消0已完成1申请中")
                                              @RequestParam(value = "status",required = false) String status,
                                              @ApiParam(name="svrDesc",value = "安防工单服务类型 关联security_server_dict字典")
@@ -162,9 +161,9 @@ public class AdminListInfoController extends EnvelopRestEndpoint {
                return ListEnvelop.getError("该操作没有权限");
            }
            if (StringUtils.isBlank(patientId)&&StringUtils.isBlank(doctor)){
            /*if (StringUtils.isBlank(patientId)&&StringUtils.isBlank(doctor)){
                return ListEnvelop.getError("请求参数错误");
            }
            }*/
            return ListEnvelop.getSuccess( "查询成功",emergencyAssistanceService.getAdminEmeAndSecuOrderList(orderType,patientId,patientName,doctor,status,page,pageSize,svrDesc,area,level));
        }catch (Exception e){
            return failedListEnvelopException2(e);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -1678,8 +1678,8 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                sql += "select '20' as OrderType,ord.id,ord.patient,ord.patient_name patientName,ord.doctor,ord.status,ord.doctor_name," +
                        "'紧急呼叫' as serve_desc,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') create_time ,case p.sex when 1 then '男' when 2 then '女' else p.sex end as sex," +
                        " TIMESTAMPDIFF(YEAR,p.birthday,now()) as age,ord.order_source orderSource,p.mobile,p.photo,ord.session_id sessionId " +
                        "from base_emergency_assistance_order ord  INNER JOIN base_patient p on ord.patient = p.id  INNER JOIN base_patient_helper ph on p.id = ph.patient and ph.del=1  " +
                        " where ph.doctor='"+doctor+"' "+filter +" "+olderFilter.replace("{patient}","p.id");
                        "from base_emergency_assistance_order ord  INNER JOIN base_patient p on ord.patient = p.id  " +
                        " where 1=1 "+filter +" "+olderFilter.replace("{patient}","p.id");
            }
            if (orderTypes.contains("20")&&orderTypes.contains("22")){
                sql += " UNION ";
@@ -1689,8 +1689,8 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                        "ord.serve_desc,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') create_time ,case p.sex when 1 then '男' when 2 then '女' else p.sex end as sex, " +
                        "TIMESTAMPDIFF(YEAR,p.birthday,now()) as age,ord.order_source orderSource,p.mobile,p.photo,CONCAT(ord.patient,'_22') sessionId  " +
                        " from base_security_monitoring_order ord " +
                        " INNER JOIN base_patient p on ord.patient = p.id INNER JOIN base_patient_helper ph on p.id = ph.patient and ph.del=1 " +
                        " where ph.doctor='"+doctor+"'  "+filter +" "+olderFilter.replace("{patient}","p.id");
                        " INNER JOIN base_patient p on ord.patient = p.id " +
                        " where 1=1  "+filter +" "+olderFilter.replace("{patient}","p.id");
                if(StringUtils.isNotBlank(svrDesc)){
                    sql += " and ord.serve_desc = '"+svrDesc+"' ";
                }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -1083,7 +1083,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
                " dict. NAME, " +
                " dict.life_care_img, " +
                " dict.pad_icon_img, " +
                " A.* " +
                " A.total " +
                " FROM " +
                " base_life_care_item_dict dict " +
                " LEFT JOIN ( " +