核酸

boman-web-core/src/main/java/com/boman/web/core/controller/AccountingDataController.java

@@ -63,9 +63,8 @@ public class AccountingDataController extends BaseController {
      * 根据身份证号去查询详细信息
      */
     @GetMapping("/nucleicAcid/detailedInfo")
-    public AccountingDataVo detailedInfo( AccountingDataVo accountingData) {
-        AccountingDataVo accountingDataVo = accountingDataService.detailedInfo(accountingData);
-        return accountingDataVo;
+    public AjaxResult detailedInfo( AccountingDataVo accountingData) {
+        return accountingDataService.detailedInfo(accountingData);
     }
 
 

boman-web-core/src/main/java/com/boman/web/core/service/accounting/AccountingDataServiceImpl.java

@@ -14,6 +14,7 @@ import com.boman.common.core.web.page.TableSupport;
 import com.boman.common.datasource.annotation.Slave;
 import com.boman.domain.Czrk;
 import com.boman.domain.SysUser;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.system.api.RemoteDeptService;
 import com.boman.web.core.domain.TSampling514;
 import com.boman.web.core.domain.vo.AccountingDataVo;
@@ -158,10 +159,10 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
 
 
     @Override
-    public AccountingDataVo detailedInfo(AccountingDataVo accountingData) {
+    public AjaxResult detailedInfo(AccountingDataVo accountingData) {
         List<AccountingDataVo> accountingDataVoList = accountingDataMapper.detailedInfoByIdCard(accountingData);
         CzrkUtils.packAddrNucleicAcid(accountingDataVoList);
-        return accountingDataVoList.get(0);
+        return AjaxResult.success(accountingDataVoList.get(0));
     }
 
 

boman-web-core/src/main/java/com/boman/web/core/service/accounting/IAccountingDataService.java

@@ -62,5 +62,5 @@ public interface IAccountingDataService {
 
     int tongjiCzZ(String startTime, String endTime, String areaId);
 
-    AccountingDataVo detailedInfo(AccountingDataVo accountingData);
+    AjaxResult detailedInfo(AccountingDataVo accountingData);
 }

boman-web-core/src/main/resources/mapper/AccountingDateMapper.xml

@@ -231,8 +231,8 @@
             r.is_del = 'N'
             and r.status = '1'
             <if test="zjhm != null  and zjhm != ''">and r.id_card = #{zjhm}</if>
-            <if test="cjsj != null  and cjsj != ''">and
-                and r.cjsj = #{cjsj}
+            <if test="cjsj != null  and cjsj != ''">
+                and d.cjsj = #{cjsj}
             </if>
         </where>
         limit 1