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/orderLogProcess/OrderLogProcessController.java

@@ -85,7 +85,7 @@ public class OrderLogProcessController extends BaseController {
                return write(-1, "该操作没有权限");
            }
            JSONObject emergencyAssistanceProcess = easervice.getEmergencyAssistanceProcess(orderid,orderType);
            JSONObject emergencyAssistanceProcess = easervice.getEmergencyAssistanceProcess(orderid, orderType);
            if (null == emergencyAssistanceProcess) {
                return error(400, "工单不存在");
            }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/platForm/PatientInfoPlatFormEndpoint.java

@@ -23,13 +23,9 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
/**
 * Created by Bing on 2021/6/16.
 * 管理端pc端 居民详情大屏
@@ -440,7 +436,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            JSONObject emergencyAssistanceProcess = assistanceService.getEmergencyAssistanceProcess(orderid,orderType);
            JSONObject emergencyAssistanceProcess = assistanceService.getEmergencyAssistanceProcess(orderid, orderType);
            if (null == emergencyAssistanceProcess) {
                return ObjEnvelop.getError("工单不存在",400 );
            }

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

@@ -53,7 +53,6 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.common.LatitudeUtils;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
@@ -1471,57 +1470,18 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            jsonObject.put("status",map.get("status"));
            jsonObject.put("createTime",map.get("createTime"));
        }
        String sql = "select * from base_emergency_warn_log where (user_type = 2 and order_id = '"+orderId+"' and type IS NOT NULL) " +
                " OR (user_type = 1 AND order_id = '"+"+orderId+"+"' and type IS NOT NULL)";
        List<BaseEmergencyWarnLogDO> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(BaseEmergencyWarnLogDO.class));
        jsonObject.put("type1_status",0);
        jsonObject.put("type2_status",0);
        jsonObject.put("type3_status",0);
        jsonObject.put("type4_status",0);
        String sql = "select user_name AS userName,create_time AS createTime,content,type from base_emergency_warn_log where (user_type = 2 and order_id = '"+orderId+"' and type IS NOT NULL) " +
                " OR (user_type = 1 AND order_id = '"+orderId+"' and type IS NOT NULL) order by create_time,type ASC ";
        List<Map<String, Object>> result = jdbcTemplate.queryForList(sql);
        jsonObject.put("type5_status",0);
        jsonObject.put("type6_status",0);
        for (BaseEmergencyWarnLogDO baseEmergencyWarnLogDO : query) {
            switch (baseEmergencyWarnLogDO.getType()){
                case 1:
                    jsonObject.put("type1_status",1);
                    jsonObject.put("type1_name",baseEmergencyWarnLogDO.getUserName());
                    jsonObject.put("type1_content",baseEmergencyWarnLogDO.getContent());
                    jsonObject.put("type1_time",baseEmergencyWarnLogDO.getCreateTime());
                    break;
                case 2:
                    jsonObject.put("type2_status",1);
                    jsonObject.put("type2_name",baseEmergencyWarnLogDO.getUserName());
                    jsonObject.put("type2_content",baseEmergencyWarnLogDO.getContent());
                    jsonObject.put("type2_time",baseEmergencyWarnLogDO.getCreateTime());
                    break;
                case 3:
                    jsonObject.put("type3_status",1);
                    jsonObject.put("type3_name",baseEmergencyWarnLogDO.getUserName());
                    jsonObject.put("type3_content",baseEmergencyWarnLogDO.getContent());
                    jsonObject.put("type3_time",baseEmergencyWarnLogDO.getCreateTime());
                    break;
                case 4:
                    jsonObject.put("type4_status",1);
                    jsonObject.put("type4_name",baseEmergencyWarnLogDO.getUserName());
                    jsonObject.put("type4_content",baseEmergencyWarnLogDO.getContent());
                    jsonObject.put("type4_time",baseEmergencyWarnLogDO.getCreateTime());
                    break;
                case 5:
                    jsonObject.put("type5_status",1);
                    jsonObject.put("type5_name",baseEmergencyWarnLogDO.getUserName());
                    jsonObject.put("type5_content",baseEmergencyWarnLogDO.getContent());
                    jsonObject.put("type5_time",baseEmergencyWarnLogDO.getCreateTime());
                    break;
                case 6:
                    jsonObject.put("type6_status",1);
                    jsonObject.put("type6_name",baseEmergencyWarnLogDO.getUserName());
                    jsonObject.put("type6_content",baseEmergencyWarnLogDO.getContent());
                    jsonObject.put("type6_time",baseEmergencyWarnLogDO.getCreateTime());
                default:
                    break;
        jsonObject.put("result",result);
        for (Map<String, Object> map : result) {
            if (map.get("type").equals(5)) {
                jsonObject.put("type5_status",1);
            }
        }
        jsonObject = JSONObject.parseObject(JSON.toJSONStringWithDateFormat(jsonObject,"yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteMapNullValue));
        return jsonObject;
    }
@@ -1530,15 +1490,16 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        switch (type) {
            case 1:
                baseEmergencyWarnLogDO.setContent("呼叫110");
                baseEmergencyWarnLogDO.setType(3);
                break;
            case 2:
                baseEmergencyWarnLogDO.setContent("呼叫120");
                baseEmergencyWarnLogDO.setType(4);
                break;
            default:
                return -1;
        }
        baseEmergencyWarnLogDO.setUserType(2);
        baseEmergencyWarnLogDO.setType(4);
        baseEmergencyWarnLogDO.setCreateTime(new Date());
        logDao.save(baseEmergencyWarnLogDO);
        return 1;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -692,7 +692,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        String fliter = "  ";
        String sql = " select p.id patientCode,p.name,p.sex,p.photo,p.idcard,ord.id orderId,ord.number,ord.serve_desc,ord.create_time,ord.`status`,ord.doctor," +
                "ord.doctor_name,ord.update_user,ord.update_user_name,ord.patient_phone,ord.conclusion_status from base_security_monitoring_order ord INNER JOIN base_patient p on p.id = ord.patient " +
                "where 1=1 ";
                "where 1=1 and ord.type = 3  ";
        if (1 == dailyMonitor) {//医生日常监护居民安防工单列表查询
            if (StringUtils.isBlank(topicItem) || StringUtils.isBlank(doctor)) {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PatientInfoPlatFormService.java

@@ -155,6 +155,7 @@ public class PatientInfoPlatFormService {
            tmp.put("address",patientDO.getAddress());
            tmp.put("address",patientDO.getAddress());
            tmp.put("patient",patientDO.getId());
            tmp.put("pad_imei",patientDO.getPadImei());
            String idcard = patientDO.getIdcard();
            if (StringUtils.isNotBlank(idcard)){
                Integer age = IdCardUtil.getAgeForIdcard(idcard);