代码提交

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/survey/QuestionnaireService.java

@@ -152,7 +152,7 @@ public class QuestionnaireService extends BaseJpaService {
            }
        });
        //奖品类型
        //奖品类型(不能为空)
        dataMap.put(1, new ExcelData() {
            @Override
            public void transform(String data) {
@@ -163,7 +163,7 @@ public class QuestionnaireService extends BaseJpaService {
            }
        });
        //兑奖码
        //兑奖码（不能为空）
        dataMap.put(2, new ExcelData() {
            @Override
            public void transform(String data) {
@@ -174,7 +174,7 @@ public class QuestionnaireService extends BaseJpaService {
            }
        });
        //兑奖密码
        //兑奖密码（不能为空）
        dataMap.put(3, new ExcelData() {
            @Override
            public void transform(String data) {
@@ -190,9 +190,13 @@ public class QuestionnaireService extends BaseJpaService {
            @Override
            public void transform(String data) {
                try {
                    SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm");
                    Date validity = format.parse(data);
                    prize.setValidity(validity);
                    if (StringUtils.isNotEmpty(data)){
                        SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm");
                        Date validity = format.parse(data);
                        prize.setValidity(validity);
                    }else {
                        prize.setValidity(null);
                    }
                } catch (ParseException e) {
                    e.printStackTrace();
                }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/util/RivaEDCode.java

@@ -171,12 +171,12 @@ public class RivaEDCode {
	
	
	//测试-加密解密
//	public static void main(String[] args)
//	{
//		//解密
	/*public static void main(String[] args)
	{
		//解密
//		System.out.println(RivaEDCode.passDecode("LUZ7TN3KOT8AWCD3ZA4NBMI5VNF7E50F6XYEP2WZM68JQYY5JE02L4L5FS9R4NGUGMHSCAPW9AL","C3SHUI8OWBOA4ZASS7FEYJ6RIVXA9SW6U5OA56ERUYZTRFHCRZO8AHT4TTW2MAGT80MGXN","7A778B7F8D8D6E918F7B87756A9B"));
//
//		//加密
		
		//加密
//		System.out.println(RivaEDCode.passEncode("LUZ7TN3KOT8AWCD3ZA4NBMI5VNF7E50F6XYEP2WZM68JQYY5JE02L4L5FS9R4NGUGMHSCAPW9AL","C3SHUI8OWBOA4ZASS7FEYJ6RIVXA9SW6U5OA56ERUYZTRFHCRZO8AHT4TTW2MAGT80MGXN","1234567"));
//	}
	}*/
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/job/DoctorFeldsherTemplateJob.java

@@ -78,7 +78,7 @@ public class DoctorFeldsherTemplateJob implements Job {
                    Time tempTime = Time.valueOf("00:00:00");
                    long tempTo = tempTime.getTime();
                    long from = beforeBreakfastTime.getTime();
                    int minutes = (int) ((from - tempTo) / (1000 * 60));
                    int minutes = (int) ((from - to) / (1000 * 60));
                    try {
                        sendPatientHealth(minutes,1,schemecode,tempTime,beforeBreakfastTime,"早餐前");
                    } catch (Exception e) {
@@ -169,7 +169,7 @@ public class DoctorFeldsherTemplateJob implements Job {
                    Time tempTime = Time.valueOf("00:00:00");
                    long tempTo = tempTime.getTime();
                    long from = earlyMorningTime.getTime();
                    int minutes = (int) ((from - tempTo) / (1000 * 60));
                    int minutes = (int) ((from - to) / (1000 * 60));
                    try {
                        sendPatientHealth(minutes,2,schemecode,tempTime,earlyMorningTime,"");
                    } catch (Exception e) {

patient-co/patient-co-wlyy-job/src/main/resources/system.properties

@@ -98,8 +98,8 @@ prescription_pay_query_job=0 0/3 * * * ?
#居民24小时未回复的咨询自动关闭 每小时59分开始执行一次
finish_consult_job=0 59 * * * ?
#提醒有监测方案的居民上传数据，每29分钟执行一次
doctor_feldsher_template_job=0 0/29 * * * ?
#提醒有监测方案的居民上传数据，每隔30分钟执行一次
doctor_feldsher_template_job=0 */30 * * * ?
# 病患者定标情况同步JOB (每天2点一次)
patient_disease_contion_syn_job=0 0 2 * * ?