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, String current) {
        JSONArray resultArray = new JSONArray();
        String sql = "select * " +
                " from " +
@@ -321,6 +321,47 @@ public class FamilyMemberService extends BaseService {
            }
        }
        if (isContain && !patient.equals(current)) {
            Patient p = patientDao.findByCode(patient);
            JSONObject obj = new JSONObject();
            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;
                } else if (sign.getStatus() == 0) {
                }
            }
            obj.put("code", p.getCode());
            obj.put("name", p.getName());
            obj.put("sex", p.getSex());
            obj.put("birthday", 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(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;
    }

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

@@ -793,7 +793,7 @@ public class PatientController extends WeixinBaseController {
            String lastUid = getLastUid();
            if(StringUtils.isEmpty(lastUid)){
            if (StringUtils.isEmpty(lastUid)) {
                lastUid = getUID();
            }
@@ -808,8 +808,11 @@ public class PatientController extends WeixinBaseController {
            } else {
                JSONObject json = result.getJSONObject("data");
                if(StringUtils.isNotEmpty(lastUid)){
                    json.put("lastUid",lastUid);
                if (StringUtils.isNotEmpty(lastUid)) {
                    json.put("lastUid", lastUid);
                }
                if (lastUid.equals(getUID())) {
                    json.put("lastUid", "");
                }
                return write(200, "切换账号成功", "data", json);

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

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