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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/service/SignFamilyServiceDao.java

@@ -19,4 +19,6 @@ public interface SignFamilyServiceDao extends PagingAndSortingRepository<SignFam
    @Modifying
    @Query(" update SignFamilyService s set s.del=0 where s.signCode=?3 and s.serviceCode=?2 and s.patient=?1")
    void deletePatientService(String patientCode, String serviceCode, String signCode);
    SignFamilyService findByPatientAndSignCode(String patientCode, String code);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignFamilyServiceService.java

@@ -65,6 +65,12 @@ public class SignFamilyServiceService {
                errorPatient.add(patientCode);
                continue;
            }
            //判断患者的签约是否有该服务 有就不用添加服务
            SignFamilyService signFamilyServiceExsit = signFamilyServiceDao.findByPatientAndSignCode(patientCode,sgnFamily.getCode());
            if (signFamilyServiceExsit != null ) {
                errorPatient.add(patientCode);
                continue;
            }
            //添加服务
            SignFamilyService signFamilyService = new SignFamilyService();
            signFamilyService.setServiceCode(service.getCode());
@@ -114,9 +120,16 @@ public class SignFamilyServiceService {
        Service service = serviceDao.findByCode(serviceCode);
        List<ServiceItem> serviceItems = serviceItemDao.findByServiceCode(serviceCode);
        //判断患者是否有已经扣费的签约
        SignFamily sgnFamily = this.getSignFamily(patient);
        if (sgnFamily == null || sgnFamily.getNum() == 0 || sgnFamily.getNum() == null) {
          return false;
        }
        //判断患者的签约是否有该服务 有就不用添加服务
        SignFamilyService signFamilyServiceExsit = signFamilyServiceDao.findByPatientAndSignCode(patient,sgnFamily.getCode());
        if (signFamilyServiceExsit != null ) {
            return false;
        }
        //添加服务
        SignFamilyService signFamilyService = new SignFamilyService();