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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/scheme/PatientSchemeListDao.java

@@ -16,6 +16,6 @@ public interface PatientSchemeListDao extends
        JpaSpecificationExecutor<PatientSchemeList> {
    @Modifying
    @Query("delete PatientSchemeList where patientcode=?1 and type=?2 and schemecode=?3")
    void delByPatientCodeAndSchemeCode(String patientcode, int i, String code);
    @Query("delete PatientSchemeList where patientcode=?1 and type=?2")
    void delByPatientCode(String patientcode, int i);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -133,7 +133,7 @@ public class SignPatientLabelInfoService extends BaseService {
        //预警状态
        json.put("standardStatus",p.getStandardStatus());
        //设备状态：0未绑定，1血糖仪，2血压仪，3血糖仪+血压仪
        json.put("deviceType",p.getDeviceType());
        json.put("deviceType",p.getDeviceType()==null?"":p.getDeviceType());
        SignFamily ssSign = signFamilyDao.findSignByPatient(patient, 1);
        SignFamily familySign = signFamilyDao.findSignByPatient(patient, 2);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/scheme/DoctorSchemeService.java

@@ -397,7 +397,7 @@ public class DoctorSchemeService extends BaseService{
            try {
                for (String patientcode : patientcodeList) {
                    patientSchemeListDao.delByPatientCodeAndSchemeCode(patientcode, Integer.parseInt(type), schemecode);
                    patientSchemeListDao.delByPatientCode(patientcode, Integer.parseInt(type));
                    PatientSchemeList patientSchemeListObj = new PatientSchemeList();
                    patientSchemeListObj.setCode(UUID.randomUUID().toString());
                    patientSchemeListObj.setPatientcode(patientcode);