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

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -195,6 +195,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             totalOrderVo.setOverTime(dbwzOrder.getOverTime());
             totalOrderVo.setOverTime(dbwzOrder.getOverTime());
             totalOrderVo.setVoucher(dbwzOrder.getVoucher());
             totalOrderVo.setVoucher(dbwzOrder.getVoucher());
             totalOrderVo.setPzRemark(dbwzOrder.getRemark());
             totalOrderVo.setPzRemark(dbwzOrder.getRemark());
+            totalOrderVo.setIndications(dbwzOrder.getIndications());
 
 
         } else if (totalOrderVo.getBusinessId() == 4) {// 住院陪护
         } else if (totalOrderVo.getBusinessId() == 4) {// 住院陪护
 
 
@@ -211,6 +212,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             totalOrderVo.setOverTime(zyphOrder.getOverTime());
             totalOrderVo.setOverTime(zyphOrder.getOverTime());
             totalOrderVo.setVoucher(zyphOrder.getVoucher());
             totalOrderVo.setVoucher(zyphOrder.getVoucher());
             totalOrderVo.setPzRemark(zyphOrder.getRemark());
             totalOrderVo.setPzRemark(zyphOrder.getRemark());
+
+
         } else if (totalOrderVo.getBusinessId() == 5) {// 代办买药
         } else if (totalOrderVo.getBusinessId() == 5) {// 代办买药
 
 
             DbmyOrder dbmyOrder = dbmyOrderMapper.selectOne(new LambdaQueryWrapper<DbmyOrder>().eq(DbmyOrder::getOrderId, totalOrderVo.getId()));
             DbmyOrder dbmyOrder = dbmyOrderMapper.selectOne(new LambdaQueryWrapper<DbmyOrder>().eq(DbmyOrder::getOrderId, totalOrderVo.getId()));
@@ -444,6 +447,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             yypzOrder.setHid(bo.getHospitalId());
             yypzOrder.setHid(bo.getHospitalId());
             yypzOrder.setDid(bo.getDepartmentId());
             yypzOrder.setDid(bo.getDepartmentId());
             yypzOrder.setVisitor(bo.getVisitorId());
             yypzOrder.setVisitor(bo.getVisitorId());
+            yypzOrder.setRemark("");
             yypzOrderMapper.insert(yypzOrder);
             yypzOrderMapper.insert(yypzOrder);
 
 
         } else if (bo.getBusinessId() == 2) {// 代办挂号
         } else if (bo.getBusinessId() == 2) {// 代办挂号
@@ -453,7 +457,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             dbghOrder.setHid(bo.getHospitalId());
             dbghOrder.setHid(bo.getHospitalId());
             dbghOrder.setDid(bo.getDepartmentId());
             dbghOrder.setDid(bo.getDepartmentId());
             dbghOrder.setVisitor(bo.getVisitorId());
             dbghOrder.setVisitor(bo.getVisitorId());
-
+            dbghOrder.setRemark("");
             dbghOrderMapper.insert(dbghOrder);
             dbghOrderMapper.insert(dbghOrder);
 
 
         } else if (bo.getBusinessId() == 3) {// 代办问诊
         } else if (bo.getBusinessId() == 3) {// 代办问诊
@@ -462,7 +466,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             dbwzOrder.setDid(bo.getDepartmentId());
             dbwzOrder.setDid(bo.getDepartmentId());
             dbwzOrder.setVisitor(bo.getVisitorId());
             dbwzOrder.setVisitor(bo.getVisitorId());
             dbwzOrderMapper.insert(dbwzOrder);
             dbwzOrderMapper.insert(dbwzOrder);
-
+            dbwzOrder.setRemark("");
         } else if (bo.getBusinessId() == 4) {// 住院陪护
         } else if (bo.getBusinessId() == 4) {// 住院陪护
 
 
             ZyphOrder zyphOrder = BeanUtil.toBean(bo, ZyphOrder.class);
             ZyphOrder zyphOrder = BeanUtil.toBean(bo, ZyphOrder.class);
@@ -470,19 +474,19 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             zyphOrder.setHid(bo.getHospitalId());
             zyphOrder.setHid(bo.getHospitalId());
             zyphOrder.setVisitor(bo.getVisitorId());
             zyphOrder.setVisitor(bo.getVisitorId());
             zyphOrderMapper.insert(zyphOrder);
             zyphOrderMapper.insert(zyphOrder);
-
+            zyphOrder.setRemark("");
         } else if (bo.getBusinessId() == 5) {// 代办买药
         } else if (bo.getBusinessId() == 5) {// 代办买药
 
 
             DbmyOrder dbmyOrder = BeanUtil.toBean(bo, DbmyOrder.class);
             DbmyOrder dbmyOrder = BeanUtil.toBean(bo, DbmyOrder.class);
             dbmyOrderMapper.insert(dbmyOrder);
             dbmyOrderMapper.insert(dbmyOrder);
-
+            dbmyOrder.setRemark("");
         } else if (bo.getBusinessId() == 6) {// 诊前挂号
         } else if (bo.getBusinessId() == 6) {// 诊前挂号
 
 
             ZqghOrder zqghOrder = BeanUtil.toBean(bo, ZqghOrder.class);
             ZqghOrder zqghOrder = BeanUtil.toBean(bo, ZqghOrder.class);
             zqghOrder.setHid(bo.getHospitalId());
             zqghOrder.setHid(bo.getHospitalId());
             zqghOrder.setDid(bo.getDepartmentId());
             zqghOrder.setDid(bo.getDepartmentId());
             zqghOrder.setDoctorId(bo.getDoctorId());
             zqghOrder.setDoctorId(bo.getDoctorId());
-
+            zqghOrder.setRemark("");
             zqghOrderMapper.insert(zqghOrder);
             zqghOrderMapper.insert(zqghOrder);
 
 
         } else if (bo.getBusinessId() == 0) {// 商城订单
         } else if (bo.getBusinessId() == 0) {// 商城订单