diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/checkupresult/vo/PrintRespVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/checkupresult/vo/PrintRespVO.java index cfbf554..42b0553 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/checkupresult/vo/PrintRespVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/checkupresult/vo/PrintRespVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.inspect.controller.admin.checkupresult.vo; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectitems.InspectitemsDO; import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectpatientitems.InspectPatientitemsDO; import lombok.Data; @@ -30,7 +31,8 @@ public class PrintRespVO { private String qrcode; - private List table; + //private List table; + private List table; diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java index 98195bb..8238ada 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java @@ -1,7 +1,9 @@ package cn.iocoder.yudao.module.inspect.service.inspectpatientitems; import cn.iocoder.yudao.module.inspect.controller.admin.checkupresult.vo.PrintRespVO; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectitems.InspectitemsDO; import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectpatient.InspectPatientDO; +import cn.iocoder.yudao.module.inspect.dal.mysql.inspectitems.InspectitemsMapper; import cn.iocoder.yudao.module.inspect.dal.mysql.inspectpatient.InspectPatientMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -39,6 +41,9 @@ public class InspectPatientitemsServiceImpl implements InspectPatientitemsServic @Resource private InspectPatientMapper patientMapper; + @Resource + private InspectitemsMapper inspectitemsMapper; + @Override public Integer createPatientitems(InspectPatientitemsSaveReqVO createReqVO) { // 插入 @@ -157,6 +162,7 @@ public class InspectPatientitemsServiceImpl implements InspectPatientitemsServic LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); lambdaUpdateWrapper.eq(InspectPatientDO::getMedicalSn, updateReqVO.get(0).getMedicalSn()); lambdaUpdateWrapper.set(InspectPatientDO::getSummaryResult, str.toString()); + lambdaUpdateWrapper.set(InspectPatientDO::getStatus, 4); int updatedRows = patientMapper.update(null, lambdaUpdateWrapper); } @@ -211,8 +217,9 @@ public class InspectPatientitemsServiceImpl implements InspectPatientitemsServic printRespVO.setMealAfter(mealAfter.toString()); printRespVO.setMealFront(mealFront.toString()); printRespVO.setMealOther(mealOther.toString()); - - printRespVO.setTable(list); + //检查项目 + List list3 = inspectitemsMapper.selectList(); + printRespVO.setTable(list3); printRespVO.setBarcode(inspectPatientDO.getMedicalSn()); printRespVO.setQrcode("333444555");