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

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();

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/family/DoctorFamilyController.java

@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
@@ -39,7 +38,7 @@ public class DoctorFamilyController extends WeixinBaseController {
        try {
            Map<String, JSONObject> result = new HashMap<>();
            JSONArray patients = familyService.getfamilyMember(patientCode, idcard, doctorCode);
            JSONArray patientsCustom = familyMemberService.getPatientFamilyMembers(patientCode, doctorCode);
            JSONArray patientsCustom = familyMemberService.getPatientFamilyMembers(patientCode, doctorCode,null);
            if (patients != null) {
                for(int i = 0;i < patients.length(); i++){

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -183,17 +183,19 @@ public class FamilyMemberController extends WeixinBaseController {
    /**
     * 家庭成员查询
     * @param patient
     * @param isAgree (任意值已同意（只查询家人关系表），null不同意)
     * @return
     */
    @RequestMapping(value = "/members", method = RequestMethod.GET)
    @ApiOperation(value = "家庭成员查询")
    public String getPatientFamilyMembers(@RequestParam(required = false) String patient) {
    public String getPatientFamilyMembers(@RequestParam(required = false) String patient,
                                          @RequestParam(required = false) Integer isAgree) {
        try {
            JSONArray result = new JSONArray();
            if (StringUtils.isNotEmpty(patient)) {
                result = familyMemberService.getPatientMembers(patient, "", true, getUID());
                result = familyMemberService.getPatientMembers(patient, "", true, getUID(),isAgree);
            } else  {
                result = familyMemberService.getPatientFamilyMembers(getUID(), "");
                result = familyMemberService.getPatientFamilyMembers(getUID(), "",null);
            }
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {