代码修改

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/family/FamilyMemberService.java

@@ -459,7 +459,7 @@ public class FamilyMemberService extends BaseService {
     * @param patient 居民
     * @return
     */
    public JSONArray getPatientFamilyMembers(String patient, String doctorCode) {
    public JSONArray getPatientFamilyMembers(String patient, String doctorCode,Integer isAgree) {
        JSONArray resultArray = new JSONArray();
        String sql = "select * " +
                " from " +
@@ -551,7 +551,7 @@ public class FamilyMemberService extends BaseService {
        }
        //待审核记录
        if(StringUtils.isBlank(doctorCode)){
        if(StringUtils.isEmpty(doctorCode)&&isAgree==null){
            List<PatientFamilyTemp> tempList = patientFamilyTempDao.findByPatientAndState(patient,"0");
            if(tempList!=null&&tempList.size()>0){
                for (PatientFamilyTemp temp:tempList){
@@ -677,8 +677,8 @@ public class FamilyMemberService extends BaseService {
     * @param patient 居民
     * @return
     */
    public JSONArray getPatientMembers(String patient, String doctorCode, boolean isContain, String current) {
        JSONArray resultArray = getPatientFamilyMembers(patient, doctorCode);
    public JSONArray getPatientMembers(String patient, String doctorCode, boolean isContain, String current,Integer isAgree) {
        JSONArray resultArray = getPatientFamilyMembers(patient, doctorCode,isAgree);
        if (resultArray == null) {
            resultArray = new JSONArray();