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/rehabilitation/controller/DoctorRehabilitaionInfoController.java

@@ -61,6 +61,7 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
    @RequestMapping(value = "getRehabilitationPatientListNew", method = RequestMethod.GET)
    @ApiOperation("获取康复下转居民列表")
    public String getRehabilitationPatientListNew(
            @ApiParam(name = "downPatientId", value = "下转表id", required = false) @RequestParam(value = "downPatientId", required = false) String downPatientId,
            @ApiParam(name = "doctorId", value = "医生id", required = false) @RequestParam(value = "doctorId", required = false) String doctorId,
            @ApiParam(name = "idcard", value = "身份证", required = false) @RequestParam(value = "idcard", required = false) String idcard,
            @ApiParam(name = "status", value = "", defaultValue = "0", required = false) @RequestParam(value = "status", required = false) String status,
@@ -78,7 +79,7 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
                doctorId = getUID();
                System.out.println("医生id==>getUID()==>" + getUID());
            }
            JSONObject result = rehabilitationInfoService.getRehabilitationPatientListNew(idcard, doctorId, status, page, pagesize);
            JSONObject result = rehabilitationInfoService.getRehabilitationPatientListNew( downPatientId,idcard, doctorId, status, page, pagesize);
            return write(200, "请求成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationInfoService.java

@@ -949,7 +949,7 @@ public class RehabilitationInfoService {
        return list;
    }
    public JSONObject getRehabilitationPatientListNew(String idcard, String doctorId, String status, Integer page, Integer pagesize) {
    public JSONObject getRehabilitationPatientListNew(String downPatientId, String idcard, String doctorId, String status, Integer page, Integer pagesize) {
        JSONObject object = new JSONObject();
        List<Map<String, Object>> list = null;
        String detailSql = "SELECT \n" +
@@ -981,6 +981,10 @@ public class RehabilitationInfoService {
        if (StringUtils.isNotBlank(idcard)) {
            filterSql += " and d.idcard='" + idcard + "' ";
        }
        if (StringUtils.isNotBlank(downPatientId)) {
            //wlyy_rehabilitation_patient_info的id
            filterSql += " and d.id='" + downPatientId + "' ";
        }
        if (StringUtils.isBlank(status)) {
            //看全部数据
            filterSql += "	AND (d.create_user = '" + doctorId + "'  OR ISNULL(  d.create_user  ) )\n" +
@@ -1215,11 +1219,11 @@ public class RehabilitationInfoService {
    /**
     * todo 还需要代办项目还需要重新join一张新表 todayTaskCount 今日任务项，等后面在整
     */
    public List<Map<String, Object>> getPatientRehabilitationByPatientId(String patientId,String planId) {
    public List<Map<String, Object>> getPatientRehabilitationByPatientId(String patientId, String planId) {
        String sql = "SELECT DISTINCT \n" +
                "	 a.id,a.`name`,a.birthday,a.phone,a.sex,a.mobile,c.age,a.idcard,\n" +
                "	 b.id 'planId',b.title 'planTitle',b.plan_doctor_name 'planDoctorName',d. `name` 'diseaseName',c.dept_name 'deptName',\n" +
                "	 b.`status` 'planStatus', c.hospital_name 'hospitalName',b.medical_records_code medicalRecordsCode,"+
                "	 b.`status` 'planStatus', c.hospital_name 'hospitalName',b.medical_records_code medicalRecordsCode," +
                "    c.from_source, " +
                "       CASE  \n" +
                "        WHEN c.from_source='1' THEN '手动添加'\n" +
@@ -1312,7 +1316,7 @@ public class RehabilitationInfoService {
            sql += " and b.id= '" + itemId + "'";
        }
        if (StringUtils.isNotBlank(status)) {
            sql += " and a.status =" + status ;
            sql += " and a.status =" + status;
        }
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        return list;