优化

src/main/java/thyyxxk/webserver/controller/powersi/PowerSiApiController.java

@@ -1,59 +0,0 @@
-package thyyxxk.webserver.controller.powersi;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import thyyxxk.webserver.config.exception.ExceptionEnum;
-import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.service.externalhttp.PowersiSrvc;
-import thyyxxk.webserver.utils.FilterUtil;
-import thyyxxk.webserver.utils.ResultVoUtil;
-import thyyxxk.webserver.utils.TokenUtil;
-
-/**
- * @description: 创智中台接口
- * @author: DingJie
- * @create: 2021-05-27 10:10:57
- **/
-@Slf4j
-@RestController
-@RequestMapping("/powersi")
-public class PowerSiApiController {
-    private final PowersiSrvc srvc;
-
-    @Autowired
-    public PowerSiApiController(PowersiSrvc srvc) {
-        this.srvc = srvc;
-    }
-
-    @GetMapping("/getEmpiViewUrl")
-    public ResultVo<String> getEmpiViewUrl(@RequestParam("id") String id) {
-        log.info("【操作员：{}】，请求患者360视图：{}", TokenUtil.getInstance().getTokenUserId(), id);
-        JSONObject param = new JSONObject();
-        param.put("de000000009", "");
-        param.put("de000000010", id);
-        JSONObject result = srvc.queryEmpiPatientList(param);
-        if (null == result) {
-            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
-        }
-        if (result.getIntValue("code") != 0) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString("msg"));
-        }
-        JSONArray data = result.getJSONArray("data");
-        if (null == data || data.size() == 0) {
-            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有找到此患者的主索引。");
-        }
-        JSONObject index = data.getJSONObject(0);
-        String empiViewUrl = String.format("http://172.16.32.183:9002/mmg_business_thyy/business/#/360pat/patientView?" +
-                        "mainIndex=%s&patName=%s&sexName=%s&visitId=%s&tag=patientTime",
-                index.getString("de000000007"), index.getString("de020103900"),
-                FilterUtil.filterSex(index.getString("de020104000")), id);
-        return ResultVoUtil.success(empiViewUrl);
-    }
-
-}

src/main/java/thyyxxk/webserver/controller/singlepage/LotteryController.java

@@ -33,7 +33,6 @@ public class LotteryController {
     @PassToken
     @PostMapping("/uploadLotteryUsers")
     public ResultVo<List<LotteryUser>> uploadLotteryUsers(@RequestBody MultipartFile file) throws IOException {
-
         List<LotteryUser> userList = new ArrayList<>();
         dao.truncateTable();
         Workbook workbook;
@@ -42,8 +41,7 @@ public class LotteryController {
         // 获取第一个活页数据
         Sheet sheet = workbook.getSheetAt(0);
         // 第几行开始解析
-        int rowStart = 2;
-        for (int i = rowStart; i <= sheet.getLastRowNum(); i++) {
+        for (int i = 1; i <= sheet.getLastRowNum(); i++) {
             Row row = sheet.getRow(i);
             if(null == row.getCell(0)){
                 continue;

src/main/java/thyyxxk/webserver/dao/his/singlepage/LotteryDao.java

@@ -26,7 +26,8 @@ public interface LotteryDao {
     @Select("select * from t_lottery_user where designated=#{designated}")
     LotteryUser selectDesignatedLotteryUser(String designated);
 
-    @Select("select top(1) * from t_lottery_user where won=-1 order by newid()")
+    @Select("select top(1) * from t_lottery_user " +
+            "where won=-1 and designated is null order by newid()")
     LotteryUser selectRandomLotteryUser();
 
     @Update("update t_lottery_user set won=#{lotteryCode} where code_rs=#{userCodeRs}")