Merge branch 'dev'

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -884,6 +884,11 @@ public class ConsultTeamService extends ConsultService {
            if("0".equals(check)){//存在未审核的续方
                return -1;
            }
            SignFamily signFamily = signFamilyDao.findByPatient(patient);
            if(signFamily==null){
                return -2;
            }
            Doctor doctor = doctorDao.findByCode(doctorCode);
            // 查询患者信息
            Patient p = patientDao.findByCode(patient);
@@ -896,8 +901,8 @@ public class ConsultTeamService extends ConsultService {
            jsonObject.put("title",p.getName()+"申请续方");
            //2、获取体征记录
            Iterable<PatientDevice> devices = patientDeviceDao.findByUser(patient);
            if(devices!=null||devices.iterator().hasNext()){
            List<PatientDevice> devices = patientDeviceDao.findByPatient(patient);
            if(devices!=null&&devices.size()>0){
                int count = messageDao.findTzMessage(patient);
                jsonObject.put("tzMsg","最近七天有"+count+"条异常记录");
            }else{
@@ -1022,7 +1027,8 @@ public class ConsultTeamService extends ConsultService {
    public String savePrescription(Prescription prescription,String jwCode,Doctor doctor,Patient p,ConsultTeam ct,String reason) throws Exception{
        String re = "";
        //获取智业处方详细
//        String response = jwPrescriptionService.getLastRecipe(p.getSsc(),jwCode,null,null);
//        String response = jwPrescriptionService.getRecipe(jwCode,p.getSsc());
//        JSONObject jsonObject =
        //续方主表
        prescription.setCode(getCode());