眼科版本更改

business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@@ -688,14 +688,24 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                    }
                }else {
                    if (null!=basePatientDO1){
                        res = ykyyService.addYktFamily(familyName,idCard, familySex,familyAge,phoneNum,medicare,relationName,clinicId,basePatientDO1.getUserId(),birth);
                        String cardType1 = "";
                        String cardNo = "";
                        if (StringUtils.isNotBlank(medicare)){
                            cardType1="1";
                            cardNo=medicare;
                        }
                        if (StringUtils.isNotBlank(clinicId)){
                            cardType1="2";
                            cardNo=clinicId;
                        }
                        res = ykyyPrescriptionService.add(familyName,cardType,idCard,phoneNum, dictId,cardType1,cardNo,basePatientDO1.getVerifyCode());
                    }
                    if (StringUtils.isNotEmpty(res)){
                        JSONObject jsonObject1 = JSONObject.parseObject(res);
                        if ("200".equalsIgnoreCase(jsonObject1.getString("code"))){
                            JSONObject jsonObject2 = JSONObject.parseObject(jsonObject1.getString("data"));
                            yktFamilyId = jsonObject2.getString("ID");
                            result.setYktFamilyId(yktFamilyId);
//                            JSONObject jsonObject2 = JSONObject.parseObject(jsonObject1.getString("data"));
//                            yktFamilyId = jsonObject2.getString("ID");
//                            result.setYktFamilyId(yktFamilyId);
                        }else {
                            mixEnvelop.setStatus(408);
                            mixEnvelop.setMessage("添加家人关系失败,请核对个人信息.");

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -659,6 +659,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                /*  " o.register_date AS \"registerDate\"," +*/
                " o.evaluate_status AS \"evaluateStatus\"," +
                " o.pay_status as \"payStatus\"," +
                " o.scbgjt_type as \"scbgjtType\"," +
                " o.scbgjt as \"scbgjt\"," +
                " o.scbgjt_name as \"scbgjtName\"," +
                " o.scbgjt_org_code as \"scbgjtOrgCode\"," +
                " o.scbgjt_org_name as \"scbgjtOrgName\"," +
                " o.his_status as \"hisStatus\"  " +
                " FROM " +
                " wlyy_outpatient o " +

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -3437,7 +3437,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                                            JSONObject family = familyList.getJSONObject(i);
                                            String familyMobile = family.getString("mobile");
                                            String idNo = family.getString("idNo");
                                            List<BasePatientDO> patientDOS = basePatientDao.findByMobile(familyMobile);
                                            List<BasePatientDO> patientDOS = basePatientDao.findByIdcard(idNo);
                                            BasePatientDO patientDO = new BasePatientDO();
                                            if (patientDOS==null||patientDOS.size()==0){
                                                patientDO.setDel("1");
@@ -3535,7 +3535,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                                            JSONObject family = familyList.getJSONObject(i);
                                            String familyMobile = family.getString("mobile");
                                            String idNo = family.getString("idNo");
                                            List<BasePatientDO> patientDOS = basePatientDao.findByMobile(familyMobile);
                                            List<BasePatientDO> patientDOS = basePatientDao.findByIdcard(idNo);
                                            BasePatientDO patientDO = new BasePatientDO();
                                            if (patientDOS==null||patientDOS.size()==0){
                                                patientDO.setDel("1");
@@ -3885,7 +3885,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                                            JSONObject family = familyList.getJSONObject(i);
                                            String familyMobile = family.getString("mobile");
                                            String idNo = family.getString("idNo");
                                            List<BasePatientDO> patientDOS = basePatientDao.findByMobile(familyMobile);
                                            List<BasePatientDO> patientDOS = basePatientDao.findByIdcard(idNo);
                                            BasePatientDO patientDO = new BasePatientDO();
                                            if (patientDOS == null || patientDOS.size() == 0) {
                                                patientDO.setDel("1");
@@ -3985,7 +3985,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                                            JSONObject family = familyList.getJSONObject(i);
                                            String familyMobile = family.getString("mobile");
                                            String idNo = family.getString("idNo");
                                            List<BasePatientDO> patientDOS = basePatientDao.findByMobile(familyMobile);
                                            List<BasePatientDO> patientDOS = basePatientDao.findByIdcard(idNo);
                                            BasePatientDO patientDO = new BasePatientDO();
                                            if (patientDOS == null || patientDOS.size() == 0) {
                                                patientDO.setDel("1");

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyYkyyEndpoint.java

@@ -378,7 +378,7 @@ public class WlyyYkyyEndpoint extends AbstractEndpoint {
                    JSONObject family = familyList.getJSONObject(i);
                    String familyMobile = family.getString("mobile");
                    String idNo = family.getString("idNo");
                    List<BasePatientDO> patientDOS = basePatientDao.findByMobile(familyMobile);
                    List<BasePatientDO> patientDOS = basePatientDao.findByIdcard(idNo);
                    BasePatientDO patientDO = new BasePatientDO();
                    if (patientDOS==null||patientDOS.size()==0){
                        patientDO.setDel("1");
@@ -527,7 +527,7 @@ public class WlyyYkyyEndpoint extends AbstractEndpoint {
                    JSONObject family = familyList.getJSONObject(i);
                    String familyMobile = family.getString("mobile");
                    String idNo = family.getString("idNo");
                    List<BasePatientDO> patientDOS = basePatientDao.findByMobile(familyMobile);
                    List<BasePatientDO> patientDOS = basePatientDao.findByIdcard(idNo);
                    BasePatientDO patientDO = new BasePatientDO();
                    if (patientDOS==null||patientDOS.size()==0){
                        patientDO.setDel("1");