代码修改

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/controller/DoctorRehabilitaionInfoController.java

@@ -77,7 +77,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            JSONObject result = rehabilitationInfoService.getRehabilitationPatientListNew(idcard, doctorId, status, page, pagesize);
            return write(200, "请求成功", "data", result);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -96,7 +97,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            List<Map<String, Object>> list = rehabilitationInfoService.getDetpAndDoctor(doctorName, deptCode, deptName, type, disease);
            return write(200, "请求成功", "data", list);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -117,7 +119,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            rehabilitationInfoService.createAdvice(doctorCode, code, name, content);
            return write(200, "更新成功");
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -129,7 +132,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            rehabilitationInfoService.deleteAdvice(id);
            return write(200, "删除成功");
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -144,7 +148,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            List<RehabilitationAdviceDO> list = rehabilitationInfoService.getAdviceListByDoctor(doctorCode);
            return write(200, "请求成功", "data", list);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -172,7 +177,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            JSONObject result = rehabilitationInfoService.getRehabilitationPatientList(idcard, doctorId, isTurnDown, page, pagesize);
            return write(200, "请求成功", "data", result);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -198,7 +204,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            List<Map<String, Object>> result = rehabilitationInfoService.getRehabilitationPatientPlan(idcard, doctorId, finishStatus, page, pagesize);
            return write(200, "请求成功", "data", result);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -220,7 +227,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            HashMap<String, Object> result = rehabilitationInfoService.getRehabilitationPatientPlanCount(doctorId);
            return write(200, "请求成功", "data", result);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -236,7 +244,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            List<Map<String, Object>> result = rehabilitationInfoService.getPatientRehabilitationByPatientId(patientId);
            return write(200, "请求成功", "data", result);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -248,7 +257,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            JSONObject result = rehabilitationInfoService.getDeorsumvergenceCount(getUID());
            return write(200, "请求成功", "data", result);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -276,19 +286,6 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
    }
//    @RequestMapping(value = "getMedicalHistoryDetail", method = RequestMethod.GET)
//    @ApiOperation("出院就诊详情")
//    public String getMedicalHistoryDetail(@ApiParam(name = "code", value = "code", required = true)
//                                          @RequestParam(value = "code", required = true) String code) {
//
//        try {
//            XxzxMedicalHistory history = rehabilitationInfoService.getMedicalHistoryDetail(code);
//            return write(200, "请求成功", "data", history);
//        } catch (Exception e) {
//            return error(-1,e.getMessage());
//        }
//    }
    @RequestMapping(value = "getMedicalHistoryList", method = RequestMethod.GET)
    @ApiOperation("获取厦心出院就诊记录信息")
    public String getMedicalHistoryList(
@@ -299,7 +296,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            List<Map<String, Object>> list = rehabilitationInfoService.getMedicalHistoryList(code, page, size);
            return write(200, "请求成功", "data", list);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
@@ -313,56 +311,9 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            JSONObject result = rehabilitationInfoService.getDischargePatientList(hospital, getUID());
            return write(200, "请求成功", "data", result);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "操作失败");
        }
    }
//    @RequestMapping(value = "remindDoctorReceive", method = RequestMethod.POST)
//    @ApiOperation("提醒家医接收")
//    public String remindDoctorReceive(@ApiParam(name = "diseaseName", value = "疾病名称", required = true)
//                                      @RequestParam(value = "diseaseName", required = true) String diseaseName,
//                                      @ApiParam(name = "doctorCode", value = "全科医生", required = true)
//                                      @RequestParam(value = "doctorCode", required = true) String doctorCode){
//        try {
//            rehabilitationInfoService.remindDoctorReceive(diseaseName,getUID() , doctorCode);
//            return success("请求成功");
//        } catch (Exception e) {
//            return error(-1,e.getMessage());
//        }
//    }
//    @RequestMapping(value = "sendWxMsgRemindSign", method = RequestMethod.POST)
//    @ApiOperation("发送微信模板提醒签约消息")
//    public String sendWxTemplate(
//            @ApiParam(name = "patient", value = "居民code", required = false)
//            @RequestParam(value = "patient", required = false)String patient)
//    {
//        try {
//            rehabilitationInfoService.sendWxMsgRemindSign(patient);
//            return write(200, "发送成功！");
//        } catch (Exception e) {
//            return error(-1,e.getMessage());
//        }
//    }
//    @RequestMapping(value = "getPatientByIdcardOrSsc", method = RequestMethod.POST)
//    @ApiOperation("根据患者身份证或社保卡号进行搜索添加出院记录")
//    public String getPatientByIdcardOrSsc(
//            @ApiParam(name = "patientInfo", value = "居民身份证或者社保卡", required = true) @RequestParam(value = "patientInfo")String patientInfo,
//            @ApiParam(name = "type", value = "1患者家签列表 2康复下转列表", required = true) @RequestParam(value = "type") Integer type) {
//        try {
//            JSONObject object = rehabilitationInfoService.getPatientByIdcardOrSsc(patientInfo, type, getUID());
//            if(object.getInteger("status") == 200) {
//                return write(200, "添加成功！", "data", object.get("data"));
//            }else {
//                return write(-1, "添加失败！", "data", object.getString("msg"));
//            }
//        } catch (Exception e) {
//            return error(-1,e.getMessage());
//        }
//    }
}

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

@@ -66,9 +66,6 @@ public class PatientRecordService {
    @Autowired
    private JwSmjkService jwSmjkService;
    
    @Autowired
    private ZsRehabilitationInfoService zsRehabilitationInfoService;
    @Autowired
    private JwArchivesService jwArchivesService;
@@ -149,13 +146,6 @@ public class PatientRecordService {
        BasePatientDO patient = patientDao.findById(patientCode).orElse(null);
        DmHospitalDO hos = hospitalDao.findByCode(hospital);
        //如果是中山医院，优先查找中山医院的接口
        if ("922b8fa9-5aff-11e6-8344-fa163e8aee56".equals(hospital)) {
            List<Map<String, String>> map = zsRehabilitationInfoService.zsHospitalRecord(patient, hos, page, pageSize);
            if (map.size() > 0) {
                return map;
            }
        }
        //获取基卫数据--
        List hlsit = new ArrayList();

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

@@ -100,9 +100,6 @@ public class SynchronizePatientService  {
    @Autowired
    private SignPatientLabelInfoDao signPatientLabelInfoDao;
    @Autowired
    private ZsRehabilitationInfoService zsRehabilitationInfoService;
    @Autowired
    private PatientRehabilitationPlanDao patientRehabilitationPlanDao;
    @Autowired