Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920

xinelu-admin/src/main/java/com/xinelu/web/controller/common/CommonController.java

@@ -6,6 +6,7 @@ import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.utils.StringUtils;
 import com.xinelu.common.utils.file.FileUploadUtils;
 import com.xinelu.common.utils.file.FileUtils;
+import com.xinelu.common.utils.file.MimeTypeUtils;
 import com.xinelu.framework.config.ServerConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -37,6 +39,8 @@ public class CommonController {
 
     @Autowired
     private ServerConfig serverConfig;
+    @Resource
+    private XinELuConfig xinELuConfig;
 
     private static final String FILE_DELIMETER = ",";
 
@@ -147,4 +151,23 @@ public class CommonController {
             log.error("下载文件失败", e);
         }
     }
+
+    /**
+     * 通用管理端富文本上传请求（单个）
+     */
+    @PostMapping("/richTextPictureUrl")
+    public AjaxResult richTextPictureUrl(MultipartFile file) throws Exception {
+        // 上传文件路径
+        String filePath = XinELuConfig.getProfile() + xinELuConfig.getRichTextPictureUrl();
+        // 上传并返回新文件名称
+        String fileName = FileUploadUtils.uploadNurseStationPath(filePath, file, MimeTypeUtils.IMAGE_EXTENSION);
+        //拼接路径
+        String url = serverConfig.getUrl() + fileName;
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("url", url);
+        ajax.put("fileName", fileName);
+        ajax.put("newFileName", FileUtils.getName(fileName));
+        ajax.put("originalFilename", file.getOriginalFilename());
+        return ajax;
+    }
 }

xinelu-common/src/main/java/com/xinelu/common/constant/Constants.java

@@ -227,7 +227,7 @@ public class Constants {
     /**
      * 护理站简介附近图片路径上传
      */
-    public static final String NURSE_STATION_INTRODUCE_TYPE = "stationIntroducePcitureUrl";
+    public static final String NURSE_STATION_INTRODUCE_TYPE = "stationIntroducePictureUrl";
 
     /**
      * 护理站项目图片路径上传

xinelu-common/src/main/java/com/xinelu/common/enums/OrderChannelEnum.java

@@ -0,0 +1,35 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 支付渠道枚举
+ * @Author 纪寒
+ * @Date 2022-10-18 15:23:01
+ * @Version 1.0
+ */
+@Getter
+public enum OrderChannelEnum {
+
+    /**
+     * 手机App
+     */
+    MOBILE_APP("MOBILE_APP"),
+
+    /**
+     * 微信小程序
+     */
+    WECHAT_APPLET("WECHAT_APPLET"),
+
+    /**
+     * 支付宝小程序
+     */
+    ALI_PAY_APPLE("ALI_PAY_APPLE"),
+    ;
+
+    final private String info;
+
+    OrderChannelEnum(String info) {
+        this.info = info;
+    }
+}

xinelu-common/src/main/java/com/xinelu/common/enums/PatientSourceEnum.java

@@ -0,0 +1,29 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 会员信息来源枚举
+ * @Author 纪寒
+ * @Date 2023-02-24 14:08:25
+ * @Version 1.0
+ */
+@Getter
+public enum PatientSourceEnum {
+    /**
+     * 好友邀请
+     */
+    FRIEND_INVITATION("FRIEND_INVITATION"),
+
+    /**
+     * 自己搜索注册
+     */
+    REGISTER_YOURSELF("REGISTER_YOURSELF"),
+    ;
+
+    final private String info;
+
+    PatientSourceEnum(String info) {
+        this.info = info;
+    }
+}

xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscheduleplandetail/AppletSchedulePlanController.java

@@ -25,7 +25,7 @@ public class AppletSchedulePlanController extends BaseController {
 	@Resource
 	private ISchedulePlanDetailService planDetailService;
 
-	@ApiOperation("通过排班计划查询明细")
+	@ApiOperation("查询医生排班明细")
 	@GetMapping("/getList")
 	public R<List<SchedulePlanDetail>> getList(SchedulePlanDetail planDetail) {
 		List<SchedulePlanDetail> list = planDetailService.getList(planDetail);

xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseapplogin/NurseAppLoginController.java

@@ -1,5 +1,6 @@
 package com.xinelu.applet.controller.nurseapplogin;
 
+import com.xinelu.applet.dto.appletlogin.AppletUserInfoDTO;
 import com.xinelu.applet.dto.appletlogin.StationItemInfoDTO;
 import com.xinelu.applet.service.nurseapplogin.NurseAppLoginService;
 import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO;
@@ -7,14 +8,14 @@ import com.xinelu.common.annotation.MobileRequestAuthorization;
 import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.common.custominterface.Insert;
 import com.xinelu.common.custominterface.Query;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.regex.RegexUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -31,8 +32,6 @@ import java.util.Objects;
 @RequestMapping("/nurseApp/login")
 public class NurseAppLoginController extends BaseController {
 
-    @Resource
-    private RegexUtil regexUtil;
     @Resource
     private NurseAppLoginService nurseAppLoginService;
 

xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/videoconsultation/VideoConsultationController.java

@@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class VideoConsultationController {
 
     @Value("${trtc.sdkappid}")
-    private String sdkappid;
+    private Long sdkappid;
     @Value("${trtc.secretid}")
     private String secretid;
     @Value("${trtc.secretkey}")
@@ -44,7 +44,7 @@ public class VideoConsultationController {
 	@ApiOperation("获取userSig")
 	@GetMapping("getUserSig/{userId}")
 	public R<String> getUserSig(@PathVariable String userId) {
-		TLSSigAPIv2 sigAPIv2 = new TLSSigAPIv2(1600003294, "6b8b57a7eedb92b6646d1c81bd68681ab924e53b52069cd20b0f53c8e3801a18");
+		TLSSigAPIv2 sigAPIv2 = new TLSSigAPIv2(sdkappid, secretkey);
 		String userSig = sigAPIv2.genUserSig(userId, 36000);
 		return R.ok(userSig);
 	}

xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/nurseapplogin/NurseAppLoginMapper.java

@@ -15,6 +15,30 @@ import java.util.List;
  */
 public interface NurseAppLoginMapper {
 
+    /**
+     * 根据id查询被护理人疾病
+     *
+     * @param patientId 被护理人id
+     * @return int
+     */
+    int selectPatientDiseaseInfo(Long patientId);
+
+    /**
+     * 根据id删除被护理人疾病
+     *
+     * @param patientId 被护理人id
+     * @return int
+     */
+    long deletePatientDiseaseInfo(Long patientId);
+
+    /**
+     * 查询身份证数量
+     *
+     * @param cardNo 身份证号
+     * @return 数量
+     */
+    int getCardNoCount(String cardNo);
+
     /**
      * 个人中心查询
      *

xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/NurseAppLoginService.java

@@ -1,5 +1,6 @@
 package com.xinelu.applet.service.nurseapplogin;
 
+import com.xinelu.applet.dto.appletlogin.AppletUserInfoDTO;
 import com.xinelu.applet.dto.appletlogin.StationItemInfoDTO;
 import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO;
 import com.xinelu.common.core.domain.AjaxResult;

xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java

@@ -1,8 +1,11 @@
 package com.xinelu.applet.service.nurseapplogin.impl;
 
+import com.xinelu.applet.dto.appletlogin.AppletUserInfoDTO;
 import com.xinelu.applet.dto.appletlogin.StationItemInfoDTO;
 import com.xinelu.applet.mapper.appletlogin.AppletLoginMapper;
 import com.xinelu.applet.mapper.nurseapplogin.NurseAppLoginMapper;
+import com.xinelu.applet.mapper.patientcenter.PatientCenterMapper;
+import com.xinelu.applet.service.messagepush.MessagePushService;
 import com.xinelu.applet.service.nurseapplogin.NurseAppLoginService;
 import com.xinelu.applet.utils.AppointmentTimeUtil;
 import com.xinelu.applet.vo.appletlogin.NurserStationItemConsumableVO;
@@ -10,24 +13,55 @@ import com.xinelu.applet.vo.appletlogin.NurserStationItemInfoVO;
 import com.xinelu.applet.vo.nurseapplogin.PatientAndDiseaseVO;
 import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO;
 import com.xinelu.applet.vo.specialdisease.WeekDaysVO;
+import com.xinelu.common.config.AppletChatConfig;
+import com.xinelu.common.config.XinELuConfig;
+import com.xinelu.common.constant.Constants;
 import com.xinelu.common.core.domain.AjaxResult;
-import com.xinelu.common.enums.AppointmentTimeIntervalEnum;
+import com.xinelu.common.enums.*;
-import com.xinelu.common.enums.GooodsOrderStatusEnum;
+import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.AgeUtil;
+import com.xinelu.common.utils.bean.BeanUtils;
+import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
+import com.xinelu.common.utils.regex.RegexUtil;
+import com.xinelu.manage.domain.coupon.Coupon;
 import com.xinelu.manage.domain.goodsOrder.GoodsOrder;
+import com.xinelu.manage.domain.patientcouponreceive.PatientCouponReceive;
+import com.xinelu.manage.domain.patientdiseaseinfo.PatientDiseaseInfo;
+import com.xinelu.manage.domain.patientinfo.PatientInfo;
+import com.xinelu.manage.domain.patientintegralchange.PatientIntegralChange;
+import com.xinelu.manage.domain.receiveAddressInfo.ReceiveAddressInfo;
+import com.xinelu.manage.domain.subscribemessagerecord.SubscribeMessageRecord;
+import com.xinelu.manage.domain.systemsettingsinfo.SystemSettingsInfo;
+import com.xinelu.manage.mapper.coupon.CouponMapper;
+import com.xinelu.manage.mapper.patientcouponreceive.PatientCouponReceiveMapper;
+import com.xinelu.manage.mapper.patientdiseaseinfo.PatientDiseaseInfoMapper;
+import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
+import com.xinelu.manage.mapper.patientintegralchange.PatientIntegralChangeMapper;
+import com.xinelu.manage.mapper.receiveAddressInfo.ReceiveAddressInfoMapper;
+import com.xinelu.manage.mapper.subscribemessagerecord.SubscribeMessageRecordMapper;
 import com.xinelu.manage.mapper.sysarea.SysAreaMapper;
+import com.xinelu.manage.mapper.systemsettingsinfo.SystemSettingsInfoMapper;
+import com.xinelu.manage.vo.patientcouponreceive.PatientCouponReceiveInfoVO;
+import com.xinelu.manage.vo.patientinfo.PatientInfoVO;
 import com.xinelu.manage.vo.sysarea.SysAreaVO;
 import com.xinelu.system.domain.SysConfig;
 import com.xinelu.system.mapper.SysConfigMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.File;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -42,13 +76,13 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
     @Resource
     private NurseAppLoginMapper nurseAppLoginMapper;
     @Resource
-    private SysAreaMapper sysAreaMapper;
-    @Resource
     private AppletLoginMapper appletLoginMapper;
     @Resource
-    private SysConfigMapper sysConfigMapper;
+    private SysAreaMapper sysAreaMapper;
     @Resource
     private AppointmentTimeUtil appointmentTimeUtil;
+    @Resource
+    private SysConfigMapper sysConfigMapper;
 
     /**
      * 查询护理人列表信息

xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nearbynursingstation/NearbyNursingStationVO.java

@@ -101,7 +101,7 @@ public class NearbyNursingStationVO implements Serializable {
     /**
      * 护理站图片路径2
      */
-    private String stationIntroducePcitureUrl;
+    private String stationIntroducePictureUrl;
 
     /**
      * 排序

xinelu-nurse-applet/src/main/resources/mapper/applet/nearbynursingstation/NearbyNursingStationMapper.xml

@@ -37,7 +37,7 @@
         <result property="dutyPerson" column="duty_person"/>
         <result property="dutyPhone" column="duty_phone"/>
         <result property="stationPictureUrl" column="station_picture_url"/>
-        <result property="stationIntroducePcitureUrl" column="station_introduce_pciture_url"/>
+        <result property="stationIntroducePictureUrl" column="station_introduce_picture_url"/>
         <result property="sort" column="sort"/>
         <result property="nurseGrade" column="nurse_grade"/>
         <result property="openingHoursDescribe" column="opening_hours_describe"/>
@@ -262,7 +262,7 @@
         IFNULL(ns.duty_person, '') duty_person,
         IFNULL(ns.duty_phone, '') duty_phone,
         IFNULL(ns.station_picture_url, '') station_picture_url,
-        IFNULL(ns.station_introduce_pciture_url, '') station_introduce_pciture_url,
+        IFNULL(ns.station_introduce_picture_url, '') station_introduce_picture_url,
         ns.sort,
         ns.nurse_grade,
         ns.opening_hours_describe,

xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml

@@ -33,6 +33,35 @@
         <result property="diseaseName" column="disease_name"/>
     </resultMap>
 
+    <select id="selectPatientDiseaseInfo" resultType="int">
+        select
+        count(1)
+        from patient_disease_info
+        <where>
+            <if test="patientId != null">
+                patient_id = #{patientId}
+            </if>
+        </where>
+    </select>
+
+    <delete id="deletePatientDiseaseInfo" parameterType="long">
+        delete
+        from patient_disease_info
+        where patient_id = #{patientId}
+    </delete>
+
+    <select id="getCardNoCount" resultType="java.lang.Integer">
+        select
+        count(1)
+        from patient_info
+        <where>
+            del_flag = 0
+            <if test="cardNo != null">
+                and card_no = #{cardNo}
+            </if>
+        </where>
+    </select>
+
     <select id="getPatientDiseaseByPatientId" resultMap="PatientAndDiseaseVO">
         SELECT
         pi.id patientId,

xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/communityinfo/CommunityController.java

@@ -0,0 +1,122 @@
+package com.xinelu.manage.controller.communityinfo;
+
+import com.xinelu.common.annotation.Log;
+import com.xinelu.common.core.controller.BaseController;
+import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.common.custominterface.Insert;
+import com.xinelu.common.custominterface.Update;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.communityinfo.CommunityInfo;
+import com.xinelu.manage.dto.community.CommunityInfoDTO;
+import com.xinelu.manage.service.communityinfo.ICommunityInfoService;
+import com.xinelu.manage.vo.community.CommunityInfoVO;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 居住社区信息Controller
+ *
+ * @author xinyilu
+ * @date 2022-09-13
+ */
+@RestController
+@RequestMapping("/system/communityInfo")
+public class CommunityController extends BaseController {
+    @Resource
+    private ICommunityInfoService communityInfoService;
+
+    /**
+     * 查询居住社区信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:communityInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CommunityInfoVO communityInfo) {
+        startPage();
+        List<CommunityInfoVO> list = communityInfoService.selectCommunityInfoList(communityInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出居住社区信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:communityInfo:export')")
+    @Log(title = "居住社区信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CommunityInfoVO communityInfo) {
+        List<CommunityInfoVO> list = communityInfoService.selectCommunityInfoList(communityInfo);
+        ExcelUtil<CommunityInfoVO> util = new ExcelUtil<>(CommunityInfoVO.class);
+        util.exportExcel(response, list, "居住社区信息数据");
+    }
+
+    /**
+     * 获取居住社区信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:communityInfo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(communityInfoService.selectCommunityInfoById(id));
+    }
+
+    /**
+     * 新增居住社区信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:communityInfo:add')")
+    @Log(title = "居住社区信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResult add(@Validated(Insert.class) @RequestBody CommunityInfoDTO communityInfo) throws Exception {
+        return communityInfoService.insertCommunityInfoList(communityInfo.getCommunityInfoList());
+    }
+
+    /**
+     * 修改居住社区信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:communityInfo:edit')")
+    @Log(title = "居住社区信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResult edit(@Validated(Update.class) @RequestBody CommunityInfo communityInfo) throws Exception {
+        return communityInfoService.updateCommunityInfo(communityInfo);
+    }
+
+    /**
+     * 删除居住社区信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:communityInfo:remove')")
+    @Log(title = "居住社区信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(communityInfoService.deleteCommunityInfoByIds(ids));
+    }
+
+    /**
+     * 查询省级区域信息信息
+     *
+     * @return 省级区域信息集合
+     */
+    @GetMapping("/getFirstLevelInfo")
+    public AjaxResult getFirstLevelInfo() {
+        return communityInfoService.getProvinceAreaInfo();
+    }
+
+    /**
+     * 根据父级id
+     *
+     * @param parentId 父级id
+     * @return 所属下级区域信息集合
+     */
+    @GetMapping("/getSecondaryLevelInfo")
+    public AjaxResult getSecondaryLevelInfo(Long parentId) {
+        if (Objects.isNull(parentId)) {
+            return AjaxResult.error("上级区域id不能为空");
+        }
+        return communityInfoService.getSubordinateAreaInfo(parentId);
+    }
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/orderevaluateinfo/OrderEvaluateInfoController.java

@@ -0,0 +1,91 @@
+package com.xinelu.manage.controller.orderevaluateinfo;
+
+import com.xinelu.common.annotation.Log;
+import com.xinelu.common.core.controller.BaseController;
+import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.orderevaluateinfo.OrderEvaluateInfo;
+import com.xinelu.manage.service.orderevaluateinfo.IOrderEvaluateInfoService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 预约服务订单和商品订单评价信息Controller
+ *
+ * @author xinyilu
+ * @date 2022-11-17
+ */
+@RestController
+@RequestMapping("/system/orderEvaluateInfo")
+public class OrderEvaluateInfoController extends BaseController {
+    @Resource
+    private IOrderEvaluateInfoService orderEvaluateInfoService;
+
+    /**
+     * 查询预约服务订单和商品订单评价信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:orderEvaluateInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OrderEvaluateInfo orderEvaluateInfo) {
+        startPage();
+        List<OrderEvaluateInfo> list = orderEvaluateInfoService.selectOrderEvaluateInfoList(orderEvaluateInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出预约服务订单和商品订单评价信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:orderEvaluateInfo:export')")
+    @Log(title = "预约服务订单和商品订单评价信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, OrderEvaluateInfo orderEvaluateInfo) {
+        List<OrderEvaluateInfo> list = orderEvaluateInfoService.selectOrderEvaluateInfoList(orderEvaluateInfo);
+        ExcelUtil<OrderEvaluateInfo> util = new ExcelUtil<>(OrderEvaluateInfo.class);
+        util.exportExcel(response, list, "预约服务订单和商品订单评价信息数据");
+    }
+
+    /**
+     * 获取预约服务订单和商品订单评价信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:orderEvaluateInfo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(orderEvaluateInfoService.selectOrderEvaluateInfoById(id));
+    }
+
+    /**
+     * 新增预约服务订单和商品订单评价信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:orderEvaluateInfo:add')")
+    @Log(title = "预约服务订单和商品订单评价信息", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody OrderEvaluateInfo orderEvaluateInfo) {
+        return toAjax(orderEvaluateInfoService.insertOrderEvaluateInfo(orderEvaluateInfo));
+    }
+
+    /**
+     * 修改预约服务订单和商品订单评价信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:orderEvaluateInfo:edit')")
+    @Log(title = "预约服务订单和商品订单评价信息", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody OrderEvaluateInfo orderEvaluateInfo) {
+        return toAjax(orderEvaluateInfoService.updateOrderEvaluateInfo(orderEvaluateInfo));
+    }
+
+    /**
+     * 删除预约服务订单和商品订单评价信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:orderEvaluateInfo:remove')")
+    @Log(title = "预约服务订单和商品订单评价信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(orderEvaluateInfoService.deleteOrderEvaluateInfoByIds(ids));
+    }
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/communityinfo/CommunityInfo.java

@@ -0,0 +1,93 @@
+package com.xinelu.manage.domain.communityinfo;
+
+import com.xinelu.common.annotation.Excel;
+import com.xinelu.common.core.domain.BaseDomain;
+import com.xinelu.common.custominterface.Insert;
+import com.xinelu.common.custominterface.Update;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 居住社区信息对象 community_info
+ *
+ * @author xinyilu
+ * @date 2022-09-13
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "居住社区信息对象", description = "community_info")
+public class CommunityInfo extends BaseDomain implements Serializable {
+    private static final long serialVersionUID = -1144563330958336472L;
+    /**
+     * 主键id
+     */
+    @NotNull(message = "居住社区id不能为空", groups = {Update.class})
+    private Long id;
+
+    /**
+     * 所属区域编码
+     */
+    @NotNull(message = "所属区域编码不能为空", groups = {Insert.class, Update.class})
+    @ApiModelProperty(value = "所属区域编码")
+    @Excel(name = "所属区域编码")
+    private String areaCode;
+
+    /**
+     * 社区编码
+     */
+    @ApiModelProperty(value = "社区编码")
+    @Excel(name = "社区编码")
+    private String communityCode;
+
+    /**
+     * 社区名称
+     */
+    @NotBlank(message = "社区名称", groups = {Insert.class, Update.class})
+    @ApiModelProperty(value = "社区名称")
+    @Excel(name = "社区名称")
+    private String communityName;
+
+    /**
+     * 社区经度
+     */
+
+    @ApiModelProperty(value = "社区经度")
+    @Excel(name = "社区经度")
+    private String communityLongitude;
+
+    /**
+     * 社区纬度
+     */
+    @ApiModelProperty(value = "社区纬度")
+    @Excel(name = "社区纬度")
+    private String communityLatitude;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("areaCode", getAreaCode())
+                .append("communityCode", getCommunityCode())
+                .append("communityName", getCommunityName())
+                .append("communityLongitude", getCommunityLongitude())
+                .append("communityLatitude", getCommunityLatitude())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestation/NurseStation.java

@@ -226,7 +226,7 @@ public class NurseStation extends BaseDomain implements Serializable {
                 .append("dutyPerson", getDutyPerson())
                 .append("dutyPhone", getDutyPhone())
                 .append("stationPictureUrl", getStationPictureUrl())
-                .append("stationIntroducePcitureUrl", getStationIntroducePictureUrl())
+                .append("stationIntroducePictureUrl", getStationIntroducePictureUrl())
                 .append("sort", getSort())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplandetail/SchedulePlanDetail.java

@@ -1,16 +1,20 @@
 package com.xinelu.manage.domain.scheduleplandetail;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import lombok.Data;
+import org.springframework.data.annotation.Transient;
 
 /**
  * 医生排班计划明细表
  * @TableName schedule_plan_detail
  */
 @Data
+@ApiModel("医生排班计划明细表")
 public class SchedulePlanDetail implements Serializable {
     /**
      * 主键
@@ -20,46 +24,61 @@ public class SchedulePlanDetail implements Serializable {
     /**
      * 排班计划主键
      */
+	@ApiModelProperty("排班计划主键")
     private Long schedulePlanId;
 
     /**
      * 医生主键
      */
+    @ApiModelProperty("医生主键")
     private Long doctorId;
 
     /**
      * 医生姓名
      */
+    @ApiModelProperty("医生姓名")
     private String doctorName;
 
     /**
      * 排班日期
      */
+    @ApiModelProperty("排班日期")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private LocalDate scheduleDate;
 
     /**
      * 开始时间
      */
+    @ApiModelProperty("开始时间")
     @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
     private LocalTime scheduleStartTime;
 
     /**
      * 结束时间
      */
+    @ApiModelProperty("结束时间")
     @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
     private LocalTime scheduleEndTime;
 
     /**
      * 预约状态（0:未预约，1：已预约）
      */
+    @ApiModelProperty("预约状态（0:未预约，1：已预约）")
     private String applyState;
 
 	/**
 	 * 启用状态（0启用 1停用）
 	 */
+	@ApiModelProperty("启用状态（0:可预约 1：不可预约）")
 	private String status;
 
+	/**
+	 * 是否查询当前时间之后的时间
+	 */
+	@ApiModelProperty("是否查询当前时间之后的时间，0：否，1：是")
+	@Transient
+	private Integer after;
+
     private static final long serialVersionUID = 1L;
 
 }

xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/community/CommunityInfoDTO.java

@@ -0,0 +1,23 @@
+package com.xinelu.manage.dto.community;
+
+import com.xinelu.manage.domain.communityinfo.CommunityInfo;
+import lombok.Data;
+
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 居住社区接收集合
+ * @Author zhangheng
+ * @Date 2022-09-09
+ */
+@Data
+public class CommunityInfoDTO implements Serializable {
+    private static final long serialVersionUID = -8215685222114894288L;
+    /**
+     * 信息集合
+     */
+    @Valid
+    private List<CommunityInfo> communityInfoList;
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/nursestation/NurseStationDTO.java

@@ -23,6 +23,7 @@ public class NurseStationDTO extends NurseStation implements Serializable {
      * 护理站的id
      **/
     private Long nurseStationId;
+
     /**
      * 护理站标签信息表id集合
      **/

xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/communityinfo/CommunityInfoMapper.java

@@ -0,0 +1,56 @@
+package com.xinelu.manage.mapper.communityinfo;
+
+
+import com.xinelu.manage.domain.communityinfo.CommunityInfo;
+import com.xinelu.manage.vo.community.CommunityInfoVO;
+
+import java.util.List;
+
+
+/**
+ * 居住社区信息Mapper接口
+ *
+ * @author xinyilu
+ * @date 2022-09-13
+ */
+public interface CommunityInfoMapper {
+    /**
+     * 查询居住社区信息
+     *
+     * @param id 居住社区信息主键
+     * @return 居住社区信息
+     */
+    CommunityInfoVO selectCommunityInfoById(Long id);
+
+    /**
+     * 查询居住社区信息列表
+     *
+     * @param communityInfo 居住社区信息
+     * @return 居住社区信息集合
+     */
+    List<CommunityInfoVO> selectCommunityInfoList(CommunityInfoVO communityInfo);
+
+    /**
+     * 新增居住社区信息
+     *
+     * @param communityInfo 居住社区信息
+     * @return 结果
+     */
+    int insertCommunityInfoList(List<CommunityInfo> communityInfo);
+
+    /**
+     * 修改居住社区信息
+     *
+     * @param communityInfo 居住社区信息
+     * @return 结果
+     */
+    int updateCommunityInfo(CommunityInfo communityInfo);
+
+    /**
+     * 批量删除居住社区信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCommunityInfoByIds(Long[] ids);
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestation/NurseStationMapper.java

@@ -104,10 +104,10 @@ public interface NurseStationMapper {
      * 修改护理站简介图片路径
      *
      * @param nurseStationCode           护理站编号
-     * @param stationIntroducePcitureUrl 护理站图片路径
+     * @param stationIntroducePictureUrl 护理站图片路径
      * @return int
      **/
-    int updateNurseStationIntroduceByHead(@Param("nurseStationCode") String nurseStationCode, @Param("stationIntroducePcitureUrl") String stationIntroducePcitureUrl);
+    int updateNurseStationIntroduceByHead(@Param("nurseStationCode") String nurseStationCode, @Param("stationIntroducePictureUrl") String stationIntroducePictureUrl);
 
 
     /**

xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/orderevaluatepictureinfo/OrderEvaluatePictureInfoMapper.java

@@ -0,0 +1,62 @@
+package com.xinelu.manage.mapper.orderevaluatepictureinfo;
+
+import com.xinelu.manage.domain.orderevaluatepictureinfo.OrderEvaluatePictureInfo;
+
+import java.util.List;
+
+
+/**
+ * 订单评价图片信息Mapper接口
+ *
+ * @author xinyilu
+ * @date 2022-11-18
+ */
+public interface OrderEvaluatePictureInfoMapper {
+    /**
+     * 查询订单评价图片信息
+     *
+     * @param id 订单评价图片信息主键
+     * @return 订单评价图片信息
+     */
+    OrderEvaluatePictureInfo selectOrderEvaluatePictureInfoById(Long id);
+
+    /**
+     * 查询订单评价图片信息列表
+     *
+     * @param orderEvaluatePictureInfo 订单评价图片信息
+     * @return 订单评价图片信息集合
+     */
+    List<OrderEvaluatePictureInfo> selectOrderEvaluatePictureInfoList(OrderEvaluatePictureInfo orderEvaluatePictureInfo);
+
+    /**
+     * 新增订单评价图片信息
+     *
+     * @param orderEvaluatePictureInfo 订单评价图片信息
+     * @return 结果
+     */
+    int insertOrderEvaluatePictureInfo(OrderEvaluatePictureInfo orderEvaluatePictureInfo);
+
+    /**
+     * 修改订单评价图片信息
+     *
+     * @param orderEvaluatePictureInfo 订单评价图片信息
+     * @return 结果
+     */
+    int updateOrderEvaluatePictureInfo(OrderEvaluatePictureInfo orderEvaluatePictureInfo);
+
+    /**
+     * 删除订单评价图片信息
+     *
+     * @param id 订单评价图片信息主键
+     * @return 结果
+     */
+    int deleteOrderEvaluatePictureInfoById(Long id);
+
+    /**
+     * 批量删除订单评价图片信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteOrderEvaluatePictureInfoByIds(Long[] ids);
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/communityinfo/ICommunityInfoService.java

@@ -0,0 +1,72 @@
+package com.xinelu.manage.service.communityinfo;
+
+
+import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.manage.domain.communityinfo.CommunityInfo;
+import com.xinelu.manage.vo.community.CommunityInfoVO;
+
+import java.util.List;
+
+
+/**
+ * 居住社区信息Service接口
+ *
+ * @author xinyilu
+ * @date 2022-09-13
+ */
+public interface ICommunityInfoService {
+    /**
+     * 查询居住社区信息
+     *
+     * @param id 居住社区信息主键
+     * @return 居住社区信息
+     */
+    CommunityInfoVO selectCommunityInfoById(Long id);
+
+    /**
+     * 查询居住社区信息列表
+     *
+     * @param communityInfo 居住社区信息
+     * @return 居住社区信息集合
+     */
+    List<CommunityInfoVO> selectCommunityInfoList(CommunityInfoVO communityInfo);
+
+    /**
+     * 新增居住社区信息
+     *
+     * @param communityInfo 居住社区信息
+     * @return 结果
+     */
+    AjaxResult insertCommunityInfoList(List<CommunityInfo> communityInfo) throws Exception;
+
+    /**
+     * 修改居住社区信息
+     *
+     * @param communityInfo 居住社区信息
+     * @return 结果
+     */
+    AjaxResult updateCommunityInfo(CommunityInfo communityInfo) throws Exception;
+
+    /**
+     * 批量删除居住社区信息
+     *
+     * @param ids 需要删除的居住社区信息主键集合
+     * @return 结果
+     */
+    int deleteCommunityInfoByIds(Long[] ids);
+
+    /**
+     * 查询省级区域信息信息
+     *
+     * @return 省级区域信息集合
+     */
+    AjaxResult getProvinceAreaInfo();
+
+    /**
+     * 根据父id查询其下属区域信息
+     *
+     * @param parentId 父级区域id
+     * @return 下属区域信息集合
+     */
+    AjaxResult getSubordinateAreaInfo(Long parentId);
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/communityinfo/impl/CommunityInfoServiceImpl.java

@@ -0,0 +1,171 @@
+package com.xinelu.manage.service.communityinfo.impl;
+
+
+import com.xinelu.common.constant.Constants;
+import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.exception.ServiceException;
+import com.xinelu.common.utils.SecurityUtils;
+import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
+import com.xinelu.manage.domain.communityinfo.CommunityInfo;
+import com.xinelu.manage.domain.sysarea.SysArea;
+import com.xinelu.manage.mapper.communityinfo.CommunityInfoMapper;
+import com.xinelu.manage.mapper.sysarea.SysAreaMapper;
+import com.xinelu.manage.service.communityinfo.ICommunityInfoService;
+import com.xinelu.manage.vo.community.CommunityInfoVO;
+import com.xinelu.manage.vo.sysarea.SysAreaVO;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 居住社区信息Service业务层处理
+ *
+ * @author xinyilu
+ * @date 2022-09-13
+ */
+@Service
+public class CommunityInfoServiceImpl implements ICommunityInfoService {
+
+    @Resource
+    private CommunityInfoMapper communityInfoMapper;
+
+    @Resource
+    private SysAreaMapper sysAreaMapper;
+
+    @Resource
+    private GenerateSystemCodeUtil generateSystemCodeUtil;
+
+    /**
+     * 查询居住社区信息
+     *
+     * @param id 居住社区信息主键
+     * @return 居住社区信息
+     */
+    @Override
+    public CommunityInfoVO selectCommunityInfoById(Long id) {
+        return communityInfoMapper.selectCommunityInfoById(id);
+    }
+
+    /**
+     * 查询居住社区信息列表
+     *
+     * @param communityInfo 居住社区信息
+     * @return 居住社区信息
+     */
+    @Override
+    public List<CommunityInfoVO> selectCommunityInfoList(CommunityInfoVO communityInfo) {
+        List<CommunityInfoVO> communityInfoVOS = communityInfoMapper.selectCommunityInfoList(communityInfo);
+        List<String> areaCodeList = communityInfoVOS
+                .stream().filter(Objects::nonNull)
+                .map(CommunityInfoVO::getAreaCode)
+                .filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
+
+        if (CollectionUtils.isEmpty(areaCodeList)) {
+            return communityInfoVOS;
+        }
+        // 获取本护理站的区域信息
+        List<SysAreaVO> nurseStationAreaByList = sysAreaMapper.getNurseStationAreaByList(areaCodeList);
+        if (CollectionUtils.isEmpty(nurseStationAreaByList)) {
+            return communityInfoVOS;
+        }
+        //以护理站id进行分组将标签配置信息转为Map集合
+        Map<String, List<SysAreaVO>> nurseStationAreaMap = nurseStationAreaByList.stream()
+                .filter(Objects::nonNull)
+                .filter(item -> Objects.nonNull(item.getStreetCode()))
+                .collect(Collectors.groupingBy(SysAreaVO::getStreetCode));
+        communityInfoVOS.forEach(item ->
+                item.setSysAreaVOList(nurseStationAreaMap.getOrDefault(Objects.isNull(item.getAreaCode()) ? 0L : item.getAreaCode(), Lists.newArrayList())));
+        return communityInfoVOS;
+    }
+
+    /**
+     * 新增居住社区信息
+     *
+     * @param communityInfo 居住社区信息
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public AjaxResult insertCommunityInfoList(List<CommunityInfo> communityInfo) throws Exception {
+        if (CollectionUtils.isEmpty(communityInfo)) {
+            return AjaxResult.error("请添加数据");
+        }
+        //插如数据
+        for (CommunityInfo community : communityInfo) {
+            community.setCreateTime(LocalDateTime.now());
+            community.setCreateBy(SecurityUtils.getUsername());
+            //编号生成
+            community.setCommunityCode(Constants.COMMUNITY_CODE
+                    + generateSystemCodeUtil.generateSystemCode(Constants.COMMUNITY_CODE));
+        }
+        //批量新增
+        int infoList = communityInfoMapper.insertCommunityInfoList(communityInfo);
+        if (infoList <= 0) {
+            throw new ServiceException("新增居住社区信息失败，请联系管理员！");
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改居住社区信息
+     *
+     * @param communityInfo 居住社区信息
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public AjaxResult updateCommunityInfo(CommunityInfo communityInfo) throws Exception {
+        communityInfo.setUpdateTime(LocalDateTime.now());
+        communityInfo.setUpdateBy(SecurityUtils.getUsername());
+        int updateCommunityInfo = communityInfoMapper.updateCommunityInfo(communityInfo);
+        if (updateCommunityInfo <= 0) {
+            throw new ServiceException("修改居住社区信息失败，请联系管理员！");
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 批量删除居住社区信息
+     *
+     * @param ids 需要删除的居住社区信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCommunityInfoByIds(Long[] ids) {
+        return communityInfoMapper.deleteCommunityInfoByIds(ids);
+    }
+
+    /**
+     * 查询省级区域信息信息
+     *
+     * @return 省级区域信息集合
+     */
+    @Override
+    public AjaxResult getProvinceAreaInfo() {
+        SysArea area = new SysArea();
+        area.setAreaLevel(1);
+        return AjaxResult.success(sysAreaMapper.selectSysAreaList(area));
+    }
+
+    /**
+     * 根据父id查询其下属区域信息
+     *
+     * @param parentId 父级区域id
+     * @return 下属区域信息集合
+     */
+    @Override
+    public AjaxResult getSubordinateAreaInfo(Long parentId) {
+        SysArea area = new SysArea();
+        area.setParentId(parentId);
+        return AjaxResult.success(sysAreaMapper.selectSysAreaList(area));
+    }
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/impl/NurseStationServiceImpl.java

@@ -303,7 +303,7 @@ public class NurseStationServiceImpl implements INurseStationService {
         //获取护理站图片地址
         List<String> stationPictureUrlList = nurseStationIds.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getStationPictureUrl())).map(NurseStationSysUserVO::getStationPictureUrl).distinct().collect(Collectors.toList());
         //获取护理站简介图片地址
-        List<String> stationIntroducePictureUrlList = nurseStationIds.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getStationIntroducePcitureUrl())).map(NurseStationSysUserVO::getStationIntroducePcitureUrl).distinct().collect(Collectors.toList());
+        List<String> stationIntroducePictureUrlList = nurseStationIds.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getStationIntroducePictureUrl())).map(NurseStationSysUserVO::getStationIntroducePictureUrl).distinct().collect(Collectors.toList());
         //获取护理站富文本的内容
         List<String> nurseStationAgencyIntroduceList = nurseStationIds.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getAgencyIntroduce())).map(NurseStationSysUserVO::getAgencyIntroduce).distinct().collect(Collectors.toList());
         // 删除护理站信息

xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/orderevaluateinfo/IOrderEvaluateInfoService.java

@@ -0,0 +1,57 @@
+package com.xinelu.manage.service.orderevaluateinfo;
+
+
+import com.xinelu.manage.domain.orderevaluateinfo.OrderEvaluateInfo;
+
+import java.util.List;
+
+
+/**
+ * 预约服务订单和商品订单评价信息Service接口
+ *
+ * @author xinyilu
+ * @date 2022-11-17
+ */
+public interface IOrderEvaluateInfoService {
+
+    /**
+     * 查询预约服务订单和商品订单评价信息
+     *
+     * @param id 预约服务订单和商品订单评价信息主键
+     * @return 预约服务订单和商品订单评价信息
+     */
+    OrderEvaluateInfo selectOrderEvaluateInfoById(Long id);
+
+    /**
+     * 查询预约服务订单和商品订单评价信息列表
+     *
+     * @param orderEvaluateInfo 预约服务订单和商品订单评价信息
+     * @return 预约服务订单和商品订单评价信息集合
+     */
+    List<OrderEvaluateInfo> selectOrderEvaluateInfoList(OrderEvaluateInfo orderEvaluateInfo);
+
+    /**
+     * 新增预约服务订单和商品订单评价信息
+     *
+     * @param orderEvaluateInfo 预约服务订单和商品订单评价信息
+     * @return 结果
+     */
+    int insertOrderEvaluateInfo(OrderEvaluateInfo orderEvaluateInfo);
+
+    /**
+     * 修改预约服务订单和商品订单评价信息
+     *
+     * @param orderEvaluateInfo 预约服务订单和商品订单评价信息
+     * @return 结果
+     */
+    int updateOrderEvaluateInfo(OrderEvaluateInfo orderEvaluateInfo);
+
+    /**
+     * 批量删除预约服务订单和商品订单评价信息
+     *
+     * @param ids 需要删除的预约服务订单和商品订单评价信息主键集合
+     * @return 结果
+     */
+    int deleteOrderEvaluateInfoByIds(Long[] ids);
+
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/orderevaluateinfo/impl/OrderEvaluateInfoServiceImpl.java

@@ -0,0 +1,80 @@
+package com.xinelu.manage.service.orderevaluateinfo.impl;
+
+import com.xinelu.manage.domain.orderevaluateinfo.OrderEvaluateInfo;
+import com.xinelu.manage.mapper.orderevaluateinfo.OrderEvaluateInfoMapper;
+import com.xinelu.manage.service.orderevaluateinfo.IOrderEvaluateInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+/**
+ * 预约服务订单和商品订单评价信息Service业务层处理
+ *
+ * @author xinyilu
+ * @date 2022-11-17
+ */
+@Service
+public class OrderEvaluateInfoServiceImpl implements IOrderEvaluateInfoService {
+    @Resource
+    private OrderEvaluateInfoMapper orderEvaluateInfoMapper;
+
+    /**
+     * 查询预约服务订单和商品订单评价信息
+     *
+     * @param id 预约服务订单和商品订单评价信息主键
+     * @return 预约服务订单和商品订单评价信息
+     */
+    @Override
+    public OrderEvaluateInfo selectOrderEvaluateInfoById(Long id) {
+        return orderEvaluateInfoMapper.selectOrderEvaluateInfoById(id, null);
+    }
+
+    /**
+     * 查询预约服务订单和商品订单评价信息列表
+     *
+     * @param orderEvaluateInfo 预约服务订单和商品订单评价信息
+     * @return 预约服务订单和商品订单评价信息
+     */
+    @Override
+    public List<OrderEvaluateInfo> selectOrderEvaluateInfoList(OrderEvaluateInfo orderEvaluateInfo) {
+        return orderEvaluateInfoMapper.selectOrderEvaluateInfoList(orderEvaluateInfo);
+    }
+
+    /**
+     * 新增预约服务订单和商品订单评价信息
+     *
+     * @param orderEvaluateInfo 预约服务订单和商品订单评价信息
+     * @return 结果
+     */
+    @Override
+    public int insertOrderEvaluateInfo(OrderEvaluateInfo orderEvaluateInfo) {
+        orderEvaluateInfo.setCreateTime(LocalDateTime.now());
+        return orderEvaluateInfoMapper.insertOrderEvaluateInfo(orderEvaluateInfo);
+    }
+
+    /**
+     * 修改预约服务订单和商品订单评价信息
+     *
+     * @param orderEvaluateInfo 预约服务订单和商品订单评价信息
+     * @return 结果
+     */
+    @Override
+    public int updateOrderEvaluateInfo(OrderEvaluateInfo orderEvaluateInfo) {
+        orderEvaluateInfo.setUpdateTime(LocalDateTime.now());
+        return orderEvaluateInfoMapper.updateOrderEvaluateInfo(orderEvaluateInfo);
+    }
+
+    /**
+     * 批量删除预约服务订单和商品订单评价信息
+     *
+     * @param ids 需要删除的预约服务订单和商品订单评价信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderEvaluateInfoByIds(Long[] ids) {
+        return orderEvaluateInfoMapper.deleteOrderEvaluateInfoByIds(ids);
+    }
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/orderevaluatepictureinfo/IOrderEvaluatePictureInfoService.java

@@ -0,0 +1,55 @@
+package com.xinelu.manage.service.orderevaluatepictureinfo;
+
+
+import com.xinelu.manage.domain.orderevaluatepictureinfo.OrderEvaluatePictureInfo;
+
+import java.util.List;
+
+/**
+ * 订单评价图片信息Service接口
+ *
+ * @author xinyilu
+ * @date 2022-11-18
+ */
+public interface IOrderEvaluatePictureInfoService {
+
+    /**
+     * 查询订单评价图片信息
+     *
+     * @param id 订单评价图片信息主键
+     * @return 订单评价图片信息
+     */
+    OrderEvaluatePictureInfo selectOrderEvaluatePictureInfoById(Long id);
+
+    /**
+     * 查询订单评价图片信息列表
+     *
+     * @param orderEvaluatePictureInfo 订单评价图片信息
+     * @return 订单评价图片信息集合
+     */
+    List<OrderEvaluatePictureInfo> selectOrderEvaluatePictureInfoList(OrderEvaluatePictureInfo orderEvaluatePictureInfo);
+
+    /**
+     * 新增订单评价图片信息
+     *
+     * @param orderEvaluatePictureInfo 订单评价图片信息
+     * @return 结果
+     */
+    int insertOrderEvaluatePictureInfo(OrderEvaluatePictureInfo orderEvaluatePictureInfo);
+
+    /**
+     * 修改订单评价图片信息
+     *
+     * @param orderEvaluatePictureInfo 订单评价图片信息
+     * @return 结果
+     */
+    int updateOrderEvaluatePictureInfo(OrderEvaluatePictureInfo orderEvaluatePictureInfo);
+
+    /**
+     * 批量删除订单评价图片信息
+     *
+     * @param ids 需要删除的订单评价图片信息主键集合
+     * @return 结果
+     */
+    int deleteOrderEvaluatePictureInfoByIds(Long[] ids);
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/orderevaluatepictureinfo/impl/OrderEvaluatePictureInfoServiceImpl.java

@@ -0,0 +1,79 @@
+package com.xinelu.manage.service.orderevaluatepictureinfo.impl;
+
+import com.xinelu.manage.domain.orderevaluatepictureinfo.OrderEvaluatePictureInfo;
+import com.xinelu.manage.mapper.orderevaluatepictureinfo.OrderEvaluatePictureInfoMapper;
+import com.xinelu.manage.service.orderevaluatepictureinfo.IOrderEvaluatePictureInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 订单评价图片信息Service业务层处理
+ *
+ * @author xinyilu
+ * @date 2022-11-18
+ */
+@Service
+public class OrderEvaluatePictureInfoServiceImpl implements IOrderEvaluatePictureInfoService {
+    @Resource
+    private OrderEvaluatePictureInfoMapper orderEvaluatePictureInfoMapper;
+
+    /**
+     * 查询订单评价图片信息
+     *
+     * @param id 订单评价图片信息主键
+     * @return 订单评价图片信息
+     */
+    @Override
+    public OrderEvaluatePictureInfo selectOrderEvaluatePictureInfoById(Long id) {
+        return orderEvaluatePictureInfoMapper.selectOrderEvaluatePictureInfoById(id);
+    }
+
+    /**
+     * 查询订单评价图片信息列表
+     *
+     * @param orderEvaluatePictureInfo 订单评价图片信息
+     * @return 订单评价图片信息
+     */
+    @Override
+    public List<OrderEvaluatePictureInfo> selectOrderEvaluatePictureInfoList(OrderEvaluatePictureInfo orderEvaluatePictureInfo) {
+        return orderEvaluatePictureInfoMapper.selectOrderEvaluatePictureInfoList(orderEvaluatePictureInfo);
+    }
+
+    /**
+     * 新增订单评价图片信息
+     *
+     * @param orderEvaluatePictureInfo 订单评价图片信息
+     * @return 结果
+     */
+    @Override
+    public int insertOrderEvaluatePictureInfo(OrderEvaluatePictureInfo orderEvaluatePictureInfo) {
+        orderEvaluatePictureInfo.setCreateTime(LocalDateTime.now());
+        return orderEvaluatePictureInfoMapper.insertOrderEvaluatePictureInfo(orderEvaluatePictureInfo);
+    }
+
+    /**
+     * 修改订单评价图片信息
+     *
+     * @param orderEvaluatePictureInfo 订单评价图片信息
+     * @return 结果
+     */
+    @Override
+    public int updateOrderEvaluatePictureInfo(OrderEvaluatePictureInfo orderEvaluatePictureInfo) {
+        orderEvaluatePictureInfo.setUpdateTime(LocalDateTime.now());
+        return orderEvaluatePictureInfoMapper.updateOrderEvaluatePictureInfo(orderEvaluatePictureInfo);
+    }
+
+    /**
+     * 批量删除订单评价图片信息
+     *
+     * @param ids 需要删除的订单评价图片信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderEvaluatePictureInfoByIds(Long[] ids) {
+        return orderEvaluatePictureInfoMapper.deleteOrderEvaluatePictureInfoByIds(ids);
+    }
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/community/CommunityInfoVO.java

@@ -0,0 +1,30 @@
+package com.xinelu.manage.vo.community;
+
+import com.xinelu.manage.domain.communityinfo.CommunityInfo;
+import com.xinelu.manage.vo.sysarea.SysAreaVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 居住社区传输实体类
+ * @Author zhangheng
+ * @Date 2022-09-09
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CommunityInfoVO extends CommunityInfo implements Serializable {
+    private static final long serialVersionUID = -236808776108105744L;
+    /**
+     * 区域名称
+     */
+    private String areaName;
+
+    /**
+     * 护理站区域集合
+     */
+    List<SysAreaVO> sysAreaVOList;
+
+}

xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/nursestation/NurseStationSysUserVO.java

@@ -41,7 +41,7 @@ public class NurseStationSysUserVO implements Serializable {
     /**
      * 护理站简介图片路径
      */
-    private String stationIntroducePcitureUrl;
+    private String stationIntroducePictureUrl;
 
     /**
      * 护理站简介

xinelu-nurse-manage/src/main/resources/mapper/manage/communityinfo/CommunityInfoMapper.xml

@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xinelu.manage.mapper.communityinfo.CommunityInfoMapper">
+
+    <resultMap type="CommunityInfo" id="CommunityInfoResult">
+        <result property="id" column="id"/>
+        <result property="areaCode" column="area_code"/>
+        <result property="communityCode" column="community_code"/>
+        <result property="communityName" column="community_name"/>
+        <result property="communityLongitude" column="community_longitude"/>
+        <result property="communityLatitude" column="community_latitude"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectCommunityInfoVo">
+        select id,
+               area_code,
+               community_code,
+               community_name,
+               community_longitude,
+               community_latitude,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from community_info
+    </sql>
+
+    <select id="selectCommunityInfoListD" parameterType="CommunityInfo" resultMap="CommunityInfoResult">
+        <include refid="selectCommunityInfoVo"/>
+        <where>
+            <if test="areaCode != null  and areaCode != ''">
+                and area_code = #{areaCode}
+            </if>
+            <if test="communityCode != null  and communityCode != ''">
+                and community_code = #{communityCode}
+            </if>
+            <if test="communityName != null  and communityName != ''">
+                and community_name like concat('%', #{communityName}, '%')
+            </if>
+            <if test="communityLongitude != null  and communityLongitude != ''">
+                and community_longitude = #{communityLongitude}
+            </if>
+            <if test="communityLatitude != null  and communityLatitude != ''">
+                and community_latitude = #{communityLatitude}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectCommunityInfoByIdD" parameterType="Long"
+            resultMap="CommunityInfoResult">
+        <include refid="selectCommunityInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertCommunityInfo" parameterType="CommunityInfo" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into community_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="areaCode != null">area_code,
+            </if>
+            <if test="communityCode != null">community_code,
+            </if>
+            <if test="communityName != null">community_name,
+            </if>
+            <if test="communityLongitude != null">community_longitude,
+            </if>
+            <if test="communityLatitude != null">community_latitude,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="areaCode != null">#{areaCode},
+            </if>
+            <if test="communityCode != null">#{communityCode},
+            </if>
+            <if test="communityName != null">#{communityName},
+            </if>
+            <if test="communityLongitude != null">#{communityLongitude},
+            </if>
+            <if test="communityLatitude != null">#{communityLatitude},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateCommunityInfo" parameterType="CommunityInfo">
+        update community_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="areaCode != null">area_code =
+                #{areaCode},
+            </if>
+            <if test="communityCode != null">community_code =
+                #{communityCode},
+            </if>
+            <if test="communityName != null">community_name =
+                #{communityName},
+            </if>
+            <if test="communityLongitude != null">community_longitude =
+                #{communityLongitude},
+            </if>
+            <if test="communityLatitude != null">community_latitude =
+                #{communityLatitude},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCommunityInfoById" parameterType="Long">
+        delete
+        from community_info
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteCommunityInfoByIds" parameterType="String">
+        delete from community_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="selectCommunityInfoList"
+            resultType="com.xinelu.manage.vo.community.CommunityInfoVO">
+        select
+        ci.id,
+        ci.area_code,
+        ci.community_code,
+        ci.community_name,
+        ci.community_longitude,
+        ci.community_latitude,
+        ci.create_by,
+        ci.create_time,
+        ci.update_by,
+        ci.update_time,
+        sa.area_name
+        from community_info ci
+        INNER JOIN sys_area sa ON sa.area_code = ci.area_code
+        <where>
+            <if test="areaCode != null  and areaCode != ''">
+                and ci.area_code = #{areaCode}
+            </if>
+            <if test="communityCode != null  and communityCode != ''">
+                and ci.community_code = #{communityCode}
+            </if>
+            <if test="communityName != null  and communityName != ''">
+                and ci.community_name like concat('%', #{communityName}, '%')
+            </if>
+            <if test="communityLongitude != null  and communityLongitude != ''">
+                and ci.community_longitude = #{communityLongitude}
+            </if>
+            <if test="communityLatitude != null  and communityLatitude != ''">
+                and ci.community_latitude = #{communityLatitude}
+            </if>
+            <if test="areaName!= null  and communityLatitude != ''">
+                and sa.area_name like concat('%'#{areaName},'%')
+            </if>
+        </where>
+        ORDER BY ci.create_time DESC
+    </select>
+
+    <select id="selectCommunityInfoById" parameterType="Long"
+            resultType="com.xinelu.manage.vo.community.CommunityInfoVO">
+        select ci.id,
+               ci.area_code,
+               ci.community_code,
+               ci.community_name,
+               ci.community_longitude,
+               ci.community_latitude,
+               ci.create_by,
+               ci.create_time,
+               ci.update_by,
+               ci.update_time,
+               sa.area_name
+        from community_info ci
+                 INNER JOIN sys_area sa ON sa.area_code = ci.area_code
+        where ci.id = #{id}
+    </select>
+
+    <insert id="insertCommunityInfoList" parameterType="java.util.List">
+        insert into community_info
+        (
+        area_code,
+        community_code,
+        community_name,
+        community_longitude,
+        community_latitude,
+        create_by,
+        create_time
+        )
+        VALUE
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.areaCode},
+            #{item.communityCode},
+            #{item.communityName},
+            #{item.communityLongitude},
+            #{item.communityLatitude},
+            #{item.createBy},
+            #{item.createTime}
+            )
+        </foreach>
+    </insert>
+</mapper>

xinelu-nurse-manage/src/main/resources/mapper/manage/goodsInfo/GoodsInfoMapper.xml

@@ -520,7 +520,7 @@
                duty_person,
                duty_phone,
                station_picture_url,
-               station_introduce_pciture_url,
+               station_introduce_picture_url,
                sort,
                create_by,
                create_time,

xinelu-nurse-manage/src/main/resources/mapper/manage/nursestation/NurseStationMapper.xml

@@ -52,7 +52,7 @@
         <result property="dutyPerson" column="duty_person"/>
         <result property="dutyPhone" column="duty_phone"/>
         <result property="stationPictureUrl" column="station_picture_url"/>
-        <result property="stationIntroducePictureUrl" column="station_introduce_pciture_url"/>
+        <result property="stationIntroducePictureUrl" column="station_introduce_picture_url"/>
         <result property="sort" column="sort"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -108,7 +108,7 @@
                duty_person,
                duty_phone,
                station_picture_url,
-               station_introduce_pciture_url,
+               station_introduce_picture_url,
                sort,
                create_by,
                create_time,
@@ -173,8 +173,8 @@
             <if test="stationPictureUrl != null  and stationPictureUrl != ''">
                 and station_picture_url = #{stationPictureUrl}
             </if>
-            <if test="stationIntroducePcitureUrl != null  and stationIntroducePcitureUrl != ''">
+            <if test="stationIntroducePictureUrl != null  and stationIntroducePictureUrl != ''">
-                and station_introduce_pciture_url = #{stationIntroducePcitureUrl}
+                and station_introduce_picture_url = #{stationIntroducePictureUrl}
             </if>
             <if test="sort != null ">
                 and sort = #{sort}
@@ -270,7 +270,7 @@
                ns.duty_person,
                ns.duty_phone,
                ns.station_picture_url,
-               ns.station_introduce_pciture_url,
+               ns.station_introduce_picture_url,
                ns.sort,
                ns.create_by,
                ns.create_time,
@@ -334,7 +334,7 @@
             </if>
             <if test="stationPictureUrl != null">station_picture_url,
             </if>
-            <if test="stationIntroducePcitureUrl != null">station_introduce_pciture_url,
+            <if test="stationIntroducePictureUrl != null">station_introduce_picture_url,
             </if>
             <if test="sort != null">sort,
             </if>
@@ -390,7 +390,7 @@
             </if>
             <if test="stationPictureUrl != null">#{stationPictureUrl},
             </if>
-            <if test="stationIntroducePcitureUrl != null">#{stationIntroducePcitureUrl},
+            <if test="stationIntroducePictureUrl != null">#{stationIntroducePictureUrl},
             </if>
             <if test="sort != null">#{sort},
             </if>
@@ -464,8 +464,8 @@
             <if test="stationPictureUrl != null">station_picture_url =
                 #{stationPictureUrl},
             </if>
-            <if test="stationIntroducePcitureUrl != null">station_introduce_pciture_url =
+            <if test="stationIntroducePictureUrl != null">station_introduce_picture_url =
-                #{stationIntroducePcitureUrl},
+                #{stationIntroducePictureUrl},
             </if>
             <if test="sort != null">sort =
                 #{sort},
@@ -535,7 +535,7 @@
 
     <update id="updateNurseStationIntroduceByHead" parameterType="NurseStation">
         update nurse_station
-        set station_introduce_pciture_url = #{stationIntroducePcitureUrl}
+        set station_introduce_picture_url = #{stationIntroducePictureUrl}
         where nurse_station_code = #{nurseStationCode}
     </update>
 
@@ -586,7 +586,7 @@
         duty_person,
         duty_phone,
         station_picture_url,
-        station_introduce_pciture_url,
+        station_introduce_picture_url,
         sort,
         create_by,
         create_time,
@@ -617,7 +617,7 @@
         duty_person,
         duty_phone,
         station_picture_url,
-        station_introduce_pciture_url,
+        station_introduce_picture_url,
         sort,
         create_by,
         create_time,
@@ -640,7 +640,7 @@
             #{NurseStation.dutyPerson},
             #{NurseStation.dutyPhone},
             #{NurseStation.stationPictureUrl},
-            #{NurseStation.stationIntroducePcitureUrl},
+            #{NurseStation.stationIntroducePictureUrl},
             #{NurseStation.sort},
             #{NurseStation.createBy},
             #{NurseStation.createTime},
@@ -769,7 +769,7 @@
         ns.nurse_station_name,
         ns.agency_introduce,
         ns.station_picture_url,
-        ns.station_introduce_pciture_url
+        ns.station_introduce_picture_url
         FROM
         nurse_station ns
         <where>

xinelu-nurse-manage/src/main/resources/mapper/manage/nursestationitem/NurseStationItemMapper.xml

@@ -135,10 +135,9 @@
 
     <select id="selectNurseStationItemList" parameterType="NurseStationItem"
             resultType="com.xinelu.manage.vo.nursestationitem.NurseStationItemVO">
-        select nst.* ,ns.nurse_station_name, nci.classify_name, nt.nurse_type_name
+        select nst.* ,ns.nurse_station_name, nci.classify_name
         from nurse_station_item nst
         LEFT JOIN nurse_station ns on ns.id=nst.nurse_station_id
-        LEFT JOIN nurse_type nt on nt.id=nst.nurse_type_id
         LEFT JOIN nurse_classify_info nci ON nci.id = nst.nurse_classify_id
         <where>
             <if test="nurseStationId != null ">

xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplandetail/SchedulePlanDetailMapper.xml

@@ -136,6 +136,15 @@
 			<if test="scheduleDate != null">
 				and schedule_date = #{scheduleDate,jdbcType=DATE}
 			</if>
+			<if test="scheduleStartTime != null">
+				and DATE_FORMAT(schedule_start_time, '%H%i') &lt;= DATE_FORMAT(#{scheduleStartTime}, '%H%i')
+			</if>
+			<if test="scheduleEndTime != null">
+				and DATE_FORMAT(schedule_end_time, '%H%i') >= DATE_FORMAT(#{scheduleEndTime}, '%H%i')
+			</if>
+			<if test="after != null">
+				and DATE_FORMAT(schedule_end_time, '%H%i') &lt; DATE_FORMAT(now(), '%H%i')
+			</if>
 		</where>
 	</select>
 </mapper>

xinelu-nurse-manage/src/main/resources/orderevaluatepictureinfo/OrderEvaluatePictureInfoMapper.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xinelu.manage.mapper.orderevaluatepictureinfo.OrderEvaluatePictureInfoMapper">
+
+    <resultMap type="OrderEvaluatePictureInfo" id="OrderEvaluatePictureInfoResult">
+        <result property="id" column="id"/>
+        <result property="orderEvaluateId" column="order_evaluate_id"/>
+        <result property="evaluatePictureUrl" column="evaluate_picture_url"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectOrderEvaluatePictureInfoVo">
+        select id, order_evaluate_id, evaluate_picture_url, create_by, create_time, update_by, update_time
+        from order_evaluate_picture_info
+    </sql>
+
+    <select id="selectOrderEvaluatePictureInfoList" parameterType="OrderEvaluatePictureInfo"
+            resultMap="OrderEvaluatePictureInfoResult">
+        <include refid="selectOrderEvaluatePictureInfoVo"/>
+        <where>
+            <if test="orderEvaluateId != null ">
+                and order_evaluate_id = #{orderEvaluateId}
+            </if>
+            <if test="evaluatePictureUrl != null  and evaluatePictureUrl != ''">
+                and evaluate_picture_url = #{evaluatePictureUrl}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectOrderEvaluatePictureInfoById" parameterType="Long"
+            resultMap="OrderEvaluatePictureInfoResult">
+        <include refid="selectOrderEvaluatePictureInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertOrderEvaluatePictureInfo" parameterType="OrderEvaluatePictureInfo" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into order_evaluate_picture_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderEvaluateId != null">order_evaluate_id,
+            </if>
+            <if test="evaluatePictureUrl != null">evaluate_picture_url,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderEvaluateId != null">#{orderEvaluateId},
+            </if>
+            <if test="evaluatePictureUrl != null">#{evaluatePictureUrl},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateOrderEvaluatePictureInfo" parameterType="OrderEvaluatePictureInfo">
+        update order_evaluate_picture_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderEvaluateId != null">order_evaluate_id =
+                #{orderEvaluateId},
+            </if>
+            <if test="evaluatePictureUrl != null">evaluate_picture_url =
+                #{evaluatePictureUrl},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteOrderEvaluatePictureInfoById" parameterType="Long">
+        delete
+        from order_evaluate_picture_info
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteOrderEvaluatePictureInfoByIds" parameterType="String">
+        delete from order_evaluate_picture_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>