Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java
#	svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/XzzxCotroller.java

server/svr-authentication/src/main/java/com/yihu/jw/security/core/userdetails/jdbc/WlyyUserDetailsService.java

@@ -345,6 +345,7 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
                BasePatientDO patientDO = patientDao.findByIdcardAndDel(idcard,"1");
                WlyyPatientFamilyMemberDO basePatientFamilyMemberDO = familyMemberDao.findFamilyMemberByPatientAndRelationCode(patientDO.getId(),"7");
                if (basePatientFamilyMemberDO==null){
                    basePatientFamilyMemberDO = new WlyyPatientFamilyMemberDO();
                    basePatientFamilyMemberDO.setPatient(patientDO.getId());
                    basePatientFamilyMemberDO.setFamilyRelation("7");
                    basePatientFamilyMemberDO.setFamilyRelationName("自己");
@@ -354,6 +355,7 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
                    basePatientFamilyMemberDO.setUpdateTime(new Date());
                    basePatientFamilyMemberDO.setIsAuthorize(1);
                    basePatientFamilyMemberDO.setIsDel(1);
                    basePatientFamilyMemberDO.setFamilyMember(patientDO.getId());
                    familyMemberDao.save(basePatientFamilyMemberDO);
                }
            }

server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthSsoService.java

@@ -143,6 +143,23 @@ public class OauthSsoService {
                        basePatientWechatDao.save(wechatDo);
                    }
                    //保存就诊人信息
                    WlyyPatientFamilyMemberDO basePatientFamilyMemberDO = familyMemberDao.findFamilyMemberByPatientAndRelationCode(basePatientDO.getId(),"7");
                    if (basePatientFamilyMemberDO==null){
                        basePatientFamilyMemberDO = new WlyyPatientFamilyMemberDO();
                        basePatientFamilyMemberDO.setPatient(basePatientDO.getId());
                        basePatientFamilyMemberDO.setFamilyRelation("7");
                        basePatientFamilyMemberDO.setFamilyRelationName("自己");
                        basePatientFamilyMemberDO.setCardType("身份证");
                        basePatientFamilyMemberDO.setCardNo(basePatientDO.getIdcard());
                        basePatientFamilyMemberDO.setCreateTime(new Date());
                        basePatientFamilyMemberDO.setUpdateTime(new Date());
                        basePatientFamilyMemberDO.setIsAuthorize(1);
                        basePatientFamilyMemberDO.setIsDel(1);
                        basePatientFamilyMemberDO.setFamilyMember(basePatientDO.getId());
                        familyMemberDao.save(basePatientFamilyMemberDO);
                    }
                    return rs;
                }
@@ -177,6 +194,7 @@ public class OauthSsoService {
                //保存就诊人信息
                WlyyPatientFamilyMemberDO basePatientFamilyMemberDO = familyMemberDao.findFamilyMemberByPatientAndRelationCode(temp.getId(),"7");
                if (basePatientFamilyMemberDO==null){
                    basePatientFamilyMemberDO = new WlyyPatientFamilyMemberDO();
                    basePatientFamilyMemberDO.setPatient(temp.getId());
                    basePatientFamilyMemberDO.setFamilyRelation("7");
                    basePatientFamilyMemberDO.setFamilyRelationName("自己");
@@ -186,6 +204,7 @@ public class OauthSsoService {
                    basePatientFamilyMemberDO.setUpdateTime(new Date());
                    basePatientFamilyMemberDO.setIsAuthorize(1);
                    basePatientFamilyMemberDO.setIsDel(1);
                    basePatientFamilyMemberDO.setFamilyMember(temp.getId());
                    familyMemberDao.save(basePatientFamilyMemberDO);
                }
                rs.put("code",1);

server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthYlzConfigService.java

@@ -238,6 +238,7 @@ public class OauthYlzConfigService {
                        patientDO = basePatientDao.save(patient);
                        WlyyPatientFamilyMemberDO basePatientFamilyMemberDO = familyMemberDao.findFamilyMemberByPatientAndRelationCode(patientDO.getId(),"7");
                        if (basePatientFamilyMemberDO==null){
                            basePatientFamilyMemberDO = new WlyyPatientFamilyMemberDO();
                            basePatientFamilyMemberDO.setPatient(patientDO.getId());
                            basePatientFamilyMemberDO.setFamilyRelation("7");
                            basePatientFamilyMemberDO.setFamilyRelationName("自己");
@@ -247,6 +248,7 @@ public class OauthYlzConfigService {
                            basePatientFamilyMemberDO.setUpdateTime(new Date());
                            basePatientFamilyMemberDO.setIsAuthorize(1);
                            basePatientFamilyMemberDO.setIsDel(1);
                            basePatientFamilyMemberDO.setFamilyMember(patientDO.getId());
                            familyMemberDao.save(basePatientFamilyMemberDO);
                        }
                        rsMap.put("sCode",auth_status);
@@ -256,6 +258,7 @@ public class OauthYlzConfigService {
                    }else{
                        WlyyPatientFamilyMemberDO basePatientFamilyMemberDO = familyMemberDao.findFamilyMemberByPatientAndRelationCode(patientDO.getId(),"7");
                        if (basePatientFamilyMemberDO==null){
                            basePatientFamilyMemberDO = new WlyyPatientFamilyMemberDO();
                            basePatientFamilyMemberDO.setPatient(patientDO.getId());
                            basePatientFamilyMemberDO.setFamilyRelation("7");
                            basePatientFamilyMemberDO.setFamilyRelationName("自己");
@@ -265,6 +268,7 @@ public class OauthYlzConfigService {
                            basePatientFamilyMemberDO.setUpdateTime(new Date());
                            basePatientFamilyMemberDO.setIsAuthorize(1);
                            basePatientFamilyMemberDO.setIsDel(1);
                            basePatientFamilyMemberDO.setFamilyMember(patientDO.getId());
                            familyMemberDao.save(basePatientFamilyMemberDO);
                        }
                        rsMap.put("sCode",auth_status);