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

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

@@ -247,7 +247,7 @@ public class FamilyMemberService extends BaseService {
     * @param patient 居民
     * @return
     */
    public JSONArray getPatientFamilyMembers(String patient, String doctorCode) {
    public JSONArray getPatientFamilyMembers(String patient, String doctorCode, boolean isContain) {
        JSONArray resultArray = new JSONArray();
        String sql = "select * " +
                " from " +
@@ -321,6 +321,42 @@ public class FamilyMemberService extends BaseService {
            }
        }
        if (isContain) {
            Patient p = patientDao.findByCode(patient);
            List<SignFamily> signs = contractService.findAllSignByPatient(p.getCode());
            boolean ssSign = false;
            boolean jtSign = false;
            for (SignFamily sign : signs) {
                if (sign.getType() == 1 && sign.getStatus() > 0) {
                    ssSign = true;
                } else if (sign.getType() == 2 && sign.getStatus() > 0) {
                    jtSign = true;
                }
            }
            JSONObject obj = new JSONObject();
            obj.put("code", p.getCode());
            obj.put("name", p.getName());
            obj.put("sex", p.getSex());
            obj.put("birthday", p.getBirthday() == null ? "" : p.getBirthday());
            obj.put("idcard", StringUtils.isEmpty(p.getIdcard()) ? "" : p.getIdcard());
            obj.put("photo", StringUtils.isEmpty(p.getPhoto()) ? "" : p.getPhoto());
            obj.put("mobile", StringUtils.isEmpty(p.getMobile()) ? "" : p.getMobile());
            obj.put("address", StringUtils.isEmpty(String.valueOf(p.getAddress())) ? "" : p.getAddress());
            obj.put("familyRelation", "-1");
            obj.put("familyRelationName", "自己");
            if (ssSign && jtSign) {
                obj.put("signType", 3);
            } else if (!ssSign && jtSign) {
                obj.put("signType", 2);
            } else if (ssSign && !jtSign) {
                obj.put("signType", 1);
            } else {
                obj.put("signType", 0);
            }
            resultArray.put(obj);
        }
        return resultArray;
    }
@@ -331,8 +367,8 @@ public class FamilyMemberService extends BaseService {
     * @param family
     * @return
     */
    public PatientFamilyMember getPatientFamilyMember(String patient,String family) {
        PatientFamilyMember member = memberDao.findByPatientAndFamilyMember(patient,family);
    public PatientFamilyMember getPatientFamilyMember(String patient, String family) {
        PatientFamilyMember member = memberDao.findByPatientAndFamilyMember(patient, family);
        return member;
    }

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

@@ -39,7 +39,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,false);
            if (patients != null) {
                for(int i = 0;i < patients.length(); i++){

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -125,9 +125,11 @@ public class PatientController extends WeixinBaseController {
            return invalidUserException(e, -1, "患者信息查询失败！");
        }
    }
    /**
     * 患者微信圖片信息保存
     * @param mediaIds    頭像
     *
     * @param mediaIds 頭像
     * @return
     */
    @RequestMapping(value = "saveWXPhote")
@@ -142,6 +144,7 @@ public class PatientController extends WeixinBaseController {
            return invalidUserException(e, -1, "保存失败！");
        }
    }
    /**
     * 患者基本信息保存
     *
@@ -355,7 +358,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "teachers")
    @ResponseBody
    public String teachers(@RequestParam(required = false,defaultValue = "") String signDoctor) {
    public String teachers(@RequestParam(required = false, defaultValue = "") String signDoctor) {
        try {
            String code = getUID();//getUID();
            // 查询签约信息
@@ -399,9 +402,9 @@ public class PatientController extends WeixinBaseController {
                }
            }
            if(StringUtils.isNotEmpty(signDoctor)){
                List<AdminTeam> teams = teamService.findDoctorsTeams(signDoctor,qkDoctor);
                doctorJson.put("team",teams != null ? new JSONArray(teams) : new ArrayList<AdminTeam>());
            if (StringUtils.isNotEmpty(signDoctor)) {
                List<AdminTeam> teams = teamService.findDoctorsTeams(signDoctor, qkDoctor);
                doctorJson.put("team", teams != null ? new JSONArray(teams) : new ArrayList<AdminTeam>());
            }
            doctorJson.put("list", jsonArray);
@@ -796,7 +799,8 @@ public class PatientController extends WeixinBaseController {
            } else if (status == -2) {
                return error(-2, "家庭成员不存在该人");
            } else {
                return write(200, "切换账号成功", "data", result.getJSONObject("data"));
                JSONObject json = result.getJSONObject("data");
                return write(200, "切换账号成功", "data", json);
            }
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -146,9 +146,10 @@ public class FamilyMemberController extends BaseController {
     */
    @RequestMapping(value = "/members", method = RequestMethod.GET)
    @ApiOperation(value = "家庭成员查询")
    public String getPatientFamilyMembers() {
    public String getPatientFamilyMembers(@RequestParam(required = false) String patient) {
        try {
            JSONArray result = familyMemberService.getPatientFamilyMembers(getUID(), "");
            JSONArray result = familyMemberService.getPatientFamilyMembers(StringUtils.isNotEmpty(patient) ? patient : getUID(),
                    "", StringUtils.isNotEmpty(patient) ? true : false);
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {

patient-co-wlyy/src/main/resources/system.properties

@@ -203,7 +203,7 @@ guahao_url = http://www.xmsmjk.com/UrpNetService/ReservationNet.asmx
guahao_namespace = http://www.zysoft.com.cn/
#EHRµµ°¸·þÎñµØÖ·
ehr_used = true
ehr_used = false
ehr_services = http://localhost:9009/api/v1.0/
ehr_services_base = http://localhost:10220/api/v1.0/