Merge remote-tracking branch 'origin/dev/zzcx20200202_init' into dev/zzcx20200202_init

zzcx-service/src/main/java/com/diagbot/facade/OptInfoFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.OptInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.HttpUtils;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.OptVO;
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
@@ -33,7 +34,7 @@ public class OptInfoFacade extends OptInfoServiceImpl {
         optInfo.setGmtModified(now);
         optInfo.setGmtCreate(now);
         optInfo.setIp(HttpUtils.getIpAddress());
-        optInfo.setHospitalCode(hospitalVO.getHospitalCode());
+        optInfo.setHospitalCode(StringUtil.isNotBlank(hospitalVO.getHospitalCode()) ? hospitalVO.getHospitalCode() : "朗通通用");
         optInfo.setOptType(optType);
         Boolean res = this.save(optInfo);
         return res;

zzcx-service/src/main/java/com/diagbot/vo/HospitalVO.java

@@ -3,8 +3,6 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @Description:
  * @author: gaodm
@@ -15,5 +13,5 @@ import javax.validation.constraints.NotBlank;
 public class HospitalVO {
     //医院编码
     //    @NotBlank(message = "请输入医院信息")
-    private String hospitalCode = "朗通通用";
+    private String hospitalCode;
 }

zzcx-service/src/main/java/com/diagbot/web/OptInfoController.java

@@ -10,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,8 +35,8 @@ public class OptInfoController {
     @PostMapping("/saveOptInfo")
     @SysLogger("saveOptInfo")
     @Transactional
-    public RespDTO<Boolean> saveOptOnfo(@RequestBody @Validated HospitalVO hospitalVO) {
-        return RespDTO.onSuc(optInfoFacade.saveOptOnfo(hospitalVO,"1"));
+    public RespDTO<Boolean> saveOptOnfo(@RequestBody HospitalVO hospitalVO) {
+        return RespDTO.onSuc(optInfoFacade.saveOptOnfo(hospitalVO, "1"));
     }
 
     @ApiOperation(value = "获取合计数据[by:gaodm]",