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

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/DoctorDoorServiceAuditController.java

@@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.net.URLDecoder;
import java.net.URLEncoder;
/**
 * Created by zdm on 2019/3/13.
 */
@@ -166,11 +169,12 @@ public class DoctorDoorServiceAuditController extends EnvelopRestEndpoint {
    @RequestMapping(value = "create", method = RequestMethod.POST)
    @ApiOperation(value = "医生为居民开通服务资格")
    public Envelop create(
            @ApiParam(name = "jsonData", value = "开通服务资格内容jsonData")
            @RequestParam(value = "jsonData", required = true) String jsonData,
            @ApiParam(name = "doctorCode", value = "医生doctorCode")
            @RequestParam(value = "doctorCode", required = false) String doctorCode) {
            @ApiParam(name = "jsonData", value = "开通服务资格内容jsonData") @RequestParam(value = "jsonData", required = true) String jsonData,
            @ApiParam(name = "doctorCode", value = "医生doctorCode") @RequestParam(value = "doctorCode", required = false) String doctorCode
    ) {
        try {
            //解码
            jsonData = URLDecoder.decode(jsonData, "UTF-8");
            if (StringUtils.isBlank(doctorCode)) {
                doctorCode = getRepUID();
            }

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/DoorOrderController.java

@@ -89,7 +89,7 @@ public class DoorOrderController extends EnvelopRestEndpoint {
            ParamQvo qvo = JSON.parseObject(jsonStr, ParamQvo.class);
            System.out.println("参数:" + JSON.toJSONString(qvo));
            JSONObject result = wlyyDoorServiceOrderService.getDoctorInfo(qvo);
            Map<String, Object> result = wlyyDoorServiceOrderService.getDoctorInfo(qvo);
            return success("查询成功！", result);
        } catch (Exception e) {
            return failed(e.getMessage());

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/PatientDoorServiceApplicationController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.net.URLDecoder;
/**
 * Created by zdm on 2019/3/13.
 */
@@ -64,6 +66,7 @@ public class PatientDoorServiceApplicationController extends EnvelopRestEndpoint
    /**
     * 居民开通上门服务资格
     * 参数：
     */
    @RequestMapping(value = "create", method = RequestMethod.POST)
    @ApiOperation(value = "开通服务资格")
@@ -72,6 +75,7 @@ public class PatientDoorServiceApplicationController extends EnvelopRestEndpoint
            @ApiParam(name = "patientCode", value = "patientCode") @RequestParam(value = "patientCode", required = false) String patientCode
    ) {
        try {
            jsonData = URLDecoder.decode(jsonData, "UTF-8");
            if (StringUtils.isBlank(patientCode)) {
                patientCode = getRepUID();
            }

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/DoorServiceApplicationService.java

@@ -362,13 +362,33 @@ public class DoorServiceApplicationService {
     * @return
     */
    public List<Map<String, Object>> findDispatcherByPatient(String patient) throws Exception {
        String sql = "SELECT d.code,d.name FROM " +
                " manage_role_user ru LEFT JOIN " +
                " manage_roles r  ON ru.role_id=r.id " +
                " LEFT JOIN (select d.code,d.name from wlyy.wlyy_doctor d LEFT JOIN wlyy.wlyy_sign_family a ON d.hospital=a.hospital  " +
                "                 where a.patient = '" + patient + "' and a.status > 0  " +
                "                 AND d.status=1 and d.del=1) d ON ru.user_code=d.code " +
                " WHERE r.code='dispatcher' AND d.`code` IS NOT NULL";
//        String sql = "SELECT d.code,d.name FROM " +
//                " manage_role_user ru LEFT JOIN " +
//                " manage_roles r  ON ru.role_id=r.id " +
//                " LEFT JOIN (select d.code,d.name from wlyy.wlyy_doctor d LEFT JOIN wlyy.wlyy_sign_family a ON d.hospital=a.hospital  " +
//                "                 where a.patient = '" + patient + "' and a.status > 0  " +
//                "                 AND d.status=1 and d.del=1) d ON ru.user_code=d.code " +
//                " WHERE r.code='dispatcher' AND d.`code` IS NOT NULL";
//
//        List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sql);
        //第三医院是没有签约的这个动作的
        String sql = "SELECT\n" +
                "	a.doctor_code 'code',\n" +
                "	b.`name` 'name',\n" +
                "	a.org_code,\n" +
                "	a.org_name 'hospitalName',\n" +
                "	t.CODE AS roleCode,\n" +
                "	t.NAME AS roleName \n" +
                "FROM\n" +
                "	base_doctor_role r\n" +
                "	INNER JOIN base_doctor_role_dict t ON t.CODE = r.role_code\n" +
                "	INNER JOIN base_doctor_hospital a ON r.doctor_code = a.doctor_code\n" +
                "	INNER JOIN base_doctor b ON a.doctor_code = b.id \n" +
                "WHERE\n" +
                "	1 = 1 \n" +
                "	AND t.`code` = 'dispatcher' \n";
        List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sql);
        return mapList;
    }

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/WlyyDoorServiceOrderService.java

@@ -668,7 +668,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
            throw new Exception(failMsg);
        }
        //已取消的订单也可以申请
        //判断师傅存在为完成的上门服务订单
        boolean bool = wlyyDoorServiceOrderDao.existsByPatientAndStatusIn(orderDO.getPatient(),
                new Integer[]{WlyyDoorServiceOrderDO.Status.waitForSend.getType(),
                        WlyyDoorServiceOrderDO.Status.waitForAccept.getType(),
@@ -1968,17 +1968,23 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                    oneMap.put("serviceCount", serviceCount);
                    oneMap.put("isInSession", false);
                    String sessionId = String.valueOf(oneMap.get("sessionId"));
                    JSONArray parArray = imUtill.getParticipants(sessionId);
                    parArray.forEach(
                            oneParObj -> {
                                org.json.JSONObject oneParJson = (org.json.JSONObject) oneParObj;
                                if (StringUtils.equalsIgnoreCase(oneParJson.getString("id"), dispatcher)) {
                                    oneMap.put("isInSession", true);
                    JSONArray parArray = null;
                    try {
                        parArray = imUtill.getParticipants(sessionId);
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                    if (parArray!=null){
                        parArray.forEach(
                                oneParObj -> {
                                    org.json.JSONObject oneParJson = (org.json.JSONObject) oneParObj;
                                    if (StringUtils.equalsIgnoreCase(oneParJson.getString("id"), dispatcher)) {
                                        oneMap.put("isInSession", true);
                                    }
                                }
                            }
                    );
                        );
                    }
                });
        result.put(ResponseContant.resultFlag, ResponseContant.success);
        result.put(ResponseContant.resultMsg, sqlResultlist);
        JSONObject countItem = new JSONObject();
@@ -2022,15 +2028,18 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                " FROM " +
                " base_doctor d " +
                " LEFT JOIN wlyy_door_doctor_status ds ON d.`id` = ds.doctor " +
                " LEFT JOIN wlyy_door_service_order o on o.doctor = d.id  " +
                " LEFT JOIN wlyy_door_service_order o on o.doctor = d.id  and o.`status` in (2,3,4)  " +
                " LEFT JOIN base_doctor_hospital a ON d.id=a.doctor_code " +
                " WHERE 1=1 " +
                " and o.`status` in (2,3,4) " +
                " and d.enabled = 1 " +
//                " AND d.level <> 11" +
                " AND a.org_code = '{hospital}' " +
                " AND d.`name` like '%{doctorName}%' " +
                " AND (ds.`status` in ({status}) or '-100' = '{status}')" +
                " AND a.org_code = '{hospital}' ";
        if (StringUtils.isNotBlank(doctorName)) {
            sql += " AND d.`name` like '%{doctorName}%' ";
        }
        sql += " AND (ds.`status` in ({status}) or '-100' = '{status}')" +
                " AND d.del=1  " +
                " GROUP BY d.`id` " +
                " ORDER BY ds.create_time DESC " +
@@ -2050,9 +2059,12 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                " LEFT JOIN base_doctor_hospital a ON d.id=a.doctor_code " +
                " WHERE d.enabled = 1" +
//                " AND d.level <> 4" +
                " AND a.org_code = '{hospital}' " +
                " AND d.`name` like '%{doctorName}%' " +
                " AND d.del=1 and d.enabled=1 " +
                " AND a.org_code = '{hospital}' ";
        if (StringUtils.isNotBlank(doctorName)) {
            countSql += " AND d.`name` like '%{doctorName}%' ";
        }
        countSql += " AND d.del=1 and d.enabled=1 " +
                " AND (ds.`status` in ({status}) or '-100' = '{status}')";
        String finalCountSql = countSql.replace("{hospital}", hospital)
@@ -2851,8 +2863,8 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
        return result;
    }
    public JSONObject getDoctorInfo(ParamQvo qvo) {
        JSONObject result = new JSONObject();
    public Map<String, Object> getDoctorInfo(ParamQvo qvo) {
        Map<String, Object> map = new HashMap<>();
        String sql = "SELECT\n" +
                "	a.*,\n" +
                "	b.dept_name 'deptName',\n" +
@@ -2867,11 +2879,11 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                "	LEFT JOIN dict_hospital_dept h ON b.dept_code = h.CODE \n" +
                "WHERE\n" +
                "	1 = 1 \n" +
                "	AND a.id='" + qvo.getLoginUserCode() + "' " +
                "	AND b.org_code = '922b9636-5aff-11e6-8344-fa163e8aee56'";
                "	AND a.id='" + qvo.getLoginUserCode() + "' ";
//                "	AND b.org_code = '922b9636-5aff-11e6-8344-fa163e8aee56'";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        if (!list.isEmpty()) {
            Map<String, Object> map = list.get(0);
            map = list.get(0);
            //查询角色
            String roleSql = "SELECT " +
                    " t.CODE AS \"roleCode\", " +
@@ -2884,12 +2896,12 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
            List<Map<String, Object>> roleList = jdbcTemplate.queryForList(roleSql);
            if (roleList != null && roleList.size() > 0) {
                map.put("roles", list);
                map.put("roles", roleList);
            } else {
                map.put("roles", null);
            }
            result.put("data", map);
        }
        return result;
        return map;
    }
}