Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/prescription/prescription_info_js.jsp

@@ -104,7 +104,7 @@
                                    if(status ==  -2){
                                        $('#presult').val("删除")
                                    }else if (status ==  -1){
                                        $('#presult').val("审核失败:"+data.prescription.reason)
                                        $('#presult').val("审核失败:"+data.reviewed.reason)
                                    }else if (status ==  0){
                                        $('#presult').val("待审核")
                                    }else if (status ==  1){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/DoctorDao.java

@@ -44,7 +44,7 @@ public interface DoctorDao extends PagingAndSortingRepository<Doctor, Long>, Jpa
    Doctor findByMobile(String mobile);
    // 根据医生分组查询患者信息
    @Query("select a.group, b.code, b.name, b.photo, b.birthday, b.sex, b.diseaseCondition, b.disease, b.recordAmount, a.partAmount, a.qyrq, a.signType,b.idcard from DoctorPatientGroupInfo a, Patient b where a.doctor = ?1 and a.patient = b.code and a.status=1")
    @Query("select a.group, b.code, b.name, b.photo, b.birthday, b.sex, b.diseaseCondition, b.disease, b.recordAmount, a.partAmount, a.qyrq, a.signType,b.idcard,b.openid from DoctorPatientGroupInfo a, Patient b where a.doctor = ?1 and a.patient = b.code and a.status=1")
    List<Object> findPatientByDoctorSign(String doctor);
    // 根据医生分组查询患者信息