邵逸夫核酸检测

znwz-service/src/main/java/com/diagbot/facade/NacidTestFacade.java

@@ -19,30 +19,32 @@ import java.util.Date;
 @Component
 @Slf4j
 public class NacidTestFacade implements NacidTestService {
+
     NacidTestDTO nacidTestDTO =new NacidTestDTO();
 
     public NacidTestDTO queryNacid(NacidTestVO nacidTestVo){
-       String result = nacidTestVo.getREPORTVALUE();
-       if(result == null){
-           nacidTestDTO.setColour("0");
-       }else{
-           String bluedate = null;
-           String reportdate = nacidTestVo.getREPORTDT();
-           if(reportdate == null){
-               nacidTestDTO.setIndate("未查询到报告时间，无法评估");
-               nacidTestDTO.setColour("4");
-               return nacidTestDTO;
-           }else{
-               Date report_date;
-               try{
-                   report_date = DateUtil.parseDate(reportdate,"yyyy年MM月dd日");
-                   //有效时间多长？
-                   int  effective_date = Integer.parseInt(nacidTestVo.getDAY())-1;
-                   //有效期截至日期
-                   Date blue_date = DateUtil.addDate(report_date,effective_date);
-                   bluedate = new SimpleDateFormat("yyyy年MM月dd日").format(blue_date);
-                   Date now_date = DateUtil.parseDate(DateUtil.getCurrentDateStr("yyyy年MM月dd日"),"yyyy年MM月dd日");
-                   //当前日期早于蓝码日期
+        nacidTestDTO.setNacidTestVo(nacidTestVo);
+        String result = nacidTestVo.getREPORTVALUE();
+        if(result == null){
+            nacidTestDTO.setColour("0");
+        }else{
+            String bluedate = null;
+            String reportdate = nacidTestVo.getREPORTDT();
+            if(reportdate == null){
+                nacidTestDTO.setColour("0");
+                nacidTestDTO.setIndate("");
+                return nacidTestDTO;
+            }else{
+                Date report_date;
+                try{
+                    report_date = DateUtil.parseDate(reportdate,"yyyy年MM月dd日");
+                    //有效时间多长？
+                    int  effective_date = Integer.parseInt(nacidTestVo.getDAY())-1;
+                    //有效期截至日期
+                    Date blue_date = DateUtil.addDate(report_date,effective_date);
+                    bluedate = new SimpleDateFormat("yyyy年MM月dd日").format(blue_date);
+                    Date now_date = DateUtil.parseDate(DateUtil.getCurrentDateStr("yyyy年MM月dd日"),"yyyy年MM月dd日");
+                    //当前日期早于蓝码日期
                    if(now_date.before(blue_date)){
                        if(result.equals("阴性") ){
                            nacidTestDTO.setColour("1");
@@ -56,12 +58,11 @@ public class NacidTestFacade implements NacidTestService {
                        nacidTestDTO.setColour("3");
                    }
                }catch (Exception e){
-                   nacidTestDTO.setIndate("报告时间格式错误");
-                   nacidTestDTO.setColour("4");
+                    nacidTestDTO.setColour("0");
+                    nacidTestDTO.setIndate("");
                    return nacidTestDTO;
                }
            }
-           nacidTestDTO.setNacidTestVo(nacidTestVo);
            nacidTestDTO.setIndate(reportdate+"-"+bluedate);
        }
        return nacidTestDTO;