xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

评价表添加字段；

Browse Source 
服务记录接口修改；
居民信息添加户主相关字段；
This commit is contained in:
mengkuiliang 2023-10-17 15:58:26 +08:00
parent 9f4e611b0d
commit ca0611cbb5
20 changed files with 484 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xinelu-admin/src/main/java/com/xinelu/web/controller/applet/PatientScoreController.java
View File

@ -37,7 +37,7 @@ public class PatientScoreController extends BaseController {
if (!jsonObject.get("code").toString().equals("1")) {
return R.fail(jsonObject.get("msg").toString());
}
return R.ok("请求成功", jsonObject.getString("data"));
return R.ok(jsonObject.getString("data"));
}
@ApiOperation("获取居民积分记录列表")

12
xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java
View File

@ -47,9 +47,9 @@ public class ResidentPatientInfoController extends BaseController {
@ApiOperation("注册完善信息")
@PostMapping("")
public R<String> register(@Validated @RequestBody PatientInfoBody body) {
if(body.getDiseaseList() == null || body.getDiseaseList().size() == 0) {
return R.fail("请选择基础疾病");
}
// if(body.getDiseaseList() == null || body.getDiseaseList().size() == 0) {
// return R.fail("请选择基础疾病");
// }
try {
residentPatientInfoService.register(body);
return R.ok();
@ -78,9 +78,9 @@ public class ResidentPatientInfoController extends BaseController {
}
@ApiOperation("获取已注册列表")
@GetMapping("/getList/{openid}/{cityCode}")
public R<List<PatientInfo>> getList(@PathVariable String openid, @PathVariable String cityCode) {
return R.ok(residentPatientInfoService.getList(openid, cityCode));
@GetMapping("/getList/{openid}")
public R<List<PatientInfo>> getList(@PathVariable String openid) {
return R.ok(residentPatientInfoService.getList(openid, null));
}
@ApiOperation("切换账号")

60
xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java
View File

@ -1,14 +1,24 @@
package com.xinelu.web.controller.applet;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.xinelu.common.core.controller.BaseController;
import com.xinelu.common.core.domain.R;
import com.xinelu.common.core.page.TableDataInfo;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.http.HttpService;
import com.xinelu.common.utils.spring.SpringUtils;
import com.xinelu.familydoctor.applet.pojo.body.ResidentServiceApplyBody;
import com.xinelu.familydoctor.applet.pojo.entity.PatientInfo;
import com.xinelu.familydoctor.applet.pojo.query.ApplyQuery;
import com.xinelu.familydoctor.applet.pojo.query.ServiceRecordQuery;
import com.xinelu.familydoctor.applet.pojo.vo.ResidentServiceApplyVo;
import com.xinelu.familydoctor.applet.pojo.vo.ResidentServiceRecordVo;
import com.xinelu.familydoctor.applet.pojo.vo.ScreeningProjectVo;
import com.xinelu.familydoctor.applet.service.IResidentPatientInfoService;
import com.xinelu.familydoctor.applet.service.IResidentServiceAppletService;
import com.xinelu.manage.domain.orderevaluateinfo.OrderEvaluateInfo;
import com.xinelu.manage.service.orderevaluateinfo.IOrderEvaluateInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@ -16,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author mengkuiliang
@ -31,6 +42,12 @@ public class ResidentServiceApplyController extends BaseController {
@Resource
private IResidentServiceAppletService residentServiceAppletService;
@Resource
private HttpService httpService;
@Resource
private IResidentPatientInfoService residentPatientInfoService;
@Resource
private IOrderEvaluateInfoService orderEvaluateInfoService;
@ApiOperation("提交服务预约")
@PostMapping("/save")
@ -38,7 +55,7 @@ public class ResidentServiceApplyController extends BaseController {
if (body == null || StringUtils.isBlank(body.getPackageNo()) || StringUtils.isBlank(body.getFormNo())) {
return R.fail("请求参数不能为空");
}
if(StringUtils.isBlank(body.getIdentity())) {
if (StringUtils.isBlank(body.getIdentity())) {
return R.fail("居民身份证号不能为空");
}
residentServiceAppletService.insert(body);
@ -76,21 +93,40 @@ public class ResidentServiceApplyController extends BaseController {
@ApiOperation(value = "获取服务预约项目列表", notes = "获取家医个性服务包和筛查项目")
@GetMapping("/getForm/{identity}")
public R<List<ScreeningProjectVo>> getForm(@PathVariable String identity, String projectName, @RequestHeader("region") String region) {
return R.ok(residentServiceAppletService.getForm(identity, projectName,region));
return R.ok(residentServiceAppletService.getForm(identity, projectName, region));
}
@ApiOperation("服务记录列表")
@PostMapping("/record")
public TableDataInfo performanceBookingRecord(@RequestBody ApplyQuery query) {
if (StringUtils.isBlank(query.getIdentity())) {
throw new ServiceException("居民身份证号不能为空");
@GetMapping("/record/{identity}")
public R<List<ResidentServiceRecordVo>> performanceBookingRecord(@PathVariable String identity, ServiceRecordQuery query, @RequestHeader("region") String region) {
query.setIdentity(identity);
if(query.getPageNum() == null) {
query.setPageNum(1);
}
try {
startPage();
return getDataTable(residentServiceAppletService.record(query));
} catch (Exception e) {
e.printStackTrace();
throw new ServiceException(e.getMessage());
if(query.getPageSize() == null) {
query.setPageSize(100);
}
JSONObject result = httpService.post(SpringUtils.getFdUrl(region) + "/performance/recordV1", null, JSONObject.parseObject(JSONObject.toJSONString(query)));
if (result.get("code").toString().equals("0")) {
throw new ServiceException(result.get("msg").toString());
}
if (result.get("data") != null) {
List<ResidentServiceRecordVo> perRecordList = JSONArray.parseArray(result.getJSONObject("data").getJSONArray("list").toJSONString()).toJavaList(ResidentServiceRecordVo.class);
if (perRecordList != null && perRecordList.size() > 0) {
// 查询评价
List<OrderEvaluateInfo> list = orderEvaluateInfoService.selectOrderEvaluateByServiceNos(perRecordList.stream().map(ResidentServiceRecordVo::getPerformanceNo).collect(Collectors.toList()), "FAMILY_DOCTOR");
if (list != null && list.size() > 0) {
List<OrderEvaluateInfo> orderEvaluateInfoTempList;
for (ResidentServiceRecordVo record : perRecordList) {
orderEvaluateInfoTempList = list.stream().filter(o -> o.getServiceCode().equals(record.getPerformanceNo())).collect(Collectors.toList());
if (orderEvaluateInfoTempList.size() > 0) {
record.setOrderEvaluateInfo(orderEvaluateInfoTempList.get(0));
}
}
}
}
return R.ok(perRecordList);
}
return R.ok();
}
}

6
xinelu-common/src/main/java/com/xinelu/common/utils/http/HttpUtils.java
View File

@ -78,7 +78,7 @@ public class HttpUtils {
while ((line = in.readLine()) != null) {
result.append(line);
}
log.info("recv - {}", result);
// log.info("recv - {}", result);
} catch (ConnectException e) {
log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
} catch (SocketTimeoutException e) {
@ -129,7 +129,7 @@ public class HttpUtils {
while ((line = in.readLine()) != null) {
result.append(line);
}
log.info("recv - {}", result);
// log.info("recv - {}", result);
} catch (ConnectException e) {
log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e);
} catch (SocketTimeoutException e) {
@ -181,7 +181,7 @@ public class HttpUtils {
result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
}
}
log.info("recv - {}", result);
// log.info("recv - {}", result);
conn.disconnect();
br.close();
} catch (ConnectException e) {

12
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/PatientInfoBody.java
View File

@ -250,4 +250,16 @@ public class PatientInfoBody extends BaseEntity {
@ApiModelProperty(value = "当前是否选中(0： 否 1：是)", hidden = true)
private String isChecked;
/**
* 与户主关系 (1.户主本人;2.配偶;3.子女;4.(外)孙子女;5.父母;6.(外)祖父母;7.兄弟姐妹;8.儿媳;9.女婿;10.孙子女;11.侄子女;12.曾孙子女;13.祖父母;99.其他;与户主关系 1.户主本人;2.配偶;3.子女;4.(外)孙子女;5.父母;6.(外)祖父母;7.兄弟姐妹;8.儿媳;9.女婿;10.孙子女;11.侄子女;12.曾孙子女;13.祖父母;99.其他;)
*/
@ApiModelProperty(value = "与户主关系 (1.户主本人;2.配偶;3.子女;4.(外)孙子女;5.父母;6.(外)祖父母;7.兄弟姐妹;8.儿媳;9.女婿;10.孙子女;11.侄子女;12.曾孙子女;13.祖父母;99.其他;与户主关系 1.户主本人;2.配偶;3.子女;4.(外)孙子女;5.父母;6.(外)祖父母;7.兄弟姐妹;8.儿媳;9.女婿;10.孙子女;11.侄子女;12.曾孙子女;13.祖父母;99.其他;)")
private String householdRelationship;
/**
* 户主身份证号
*/
@ApiModelProperty(value = "户主身份证号")
private String householdCardNo;
}

13
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/entity/PatientInfo.java
View File

@ -288,6 +288,17 @@ public class PatientInfo extends BaseEntity {
@Excel(name = "当前是否选中(0： 否 1：是)")
private String isChecked;
/**
* 与户主关系 (1.户主本人;2.配偶;3.子女;4.(外)孙子女;5.父母;6.(外)祖父母;7.兄弟姐妹;8.儿媳;9.女婿;10.孙子女;11.侄子女;12.曾孙子女;13.祖父母;99.其他;与户主关系 1.户主本人;2.配偶;3.子女;4.(外)孙子女;5.父母;6.(外)祖父母;7.兄弟姐妹;8.儿媳;9.女婿;10.孙子女;11.侄子女;12.曾孙子女;13.祖父母;99.其他;)
*/
@ApiModelProperty(value = "与户主关系 (1.户主本人;2.配偶;3.子女;4.(外)孙子女;5.父母;6.(外)祖父母;7.兄弟姐妹;8.儿媳;9.女婿;10.孙子女;11.侄子女;12.曾孙子女;13.祖父母;99.其他;与户主关系 1.户主本人;2.配偶;3.子女;4.(外)孙子女;5.父母;6.(外)祖父母;7.兄弟姐妹;8.儿媳;9.女婿;10.孙子女;11.侄子女;12.曾孙子女;13.祖父母;99.其他;)")
private String householdRelationship;
/**
* 户主身份证号
*/
@ApiModelProperty(value = "户主身份证号")
private String householdCardNo;
@Override
public String toString() {
@ -331,6 +342,8 @@ public class PatientInfo extends BaseEntity {
.append("cityCode", getCityCode())
.append("bindingTime", getBindingTime())
.append("isChecked", getIsChecked())
.append("householdRelationship", getHouseholdRelationship())
.append("householdCardNo", getHouseholdCardNo())
.toString();
}
}

5
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/query/PatientInfoQuery.java
View File

@ -71,4 +71,9 @@ public class PatientInfoQuery extends BaseEntity {
@ApiModelProperty(value = "当前是否选中(0： 否 1：是)")
private String isChecked;
/**
* 户主身份证号
*/
@ApiModelProperty(value = "户主身份证号")
private String householdCardNo;
}

74
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/query/ServiceRecordQuery.java Normal file
View File

@ -0,0 +1,74 @@
package com.xinelu.familydoctor.applet.pojo.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author mengkuiliang
* @Description 服务记录查询类
* @Date 2023-10-17 017 14:50
* @Param
* @return
**/
@Data
@ApiModel("服务记录查询类")
public class ServiceRecordQuery {
/**
* 身份证号
*/
@ApiModelProperty(value = "身份证号", hidden = true)
private String identity;
/**
* 服务包编号
*/
@ApiModelProperty(value = "服务包编号")
private String packageNo;
/**
* 服务包名称
*/
@ApiModelProperty(value = "服务包名称")
private String packageName;
/**
* 服务项编号
*/
@ApiModelProperty(value = "服务项编号")
private String formNo;
/**
* 服务项名称
*/
@ApiModelProperty(value = "服务项名称")
private String formName;
/**
* 开始日期(yyyy-MM-dd)
*/
@ApiModelProperty(value = "开始日期(yyyy-MM-dd)")
private Date startDate;
/**
* 结束日期(yyyy-MM-dd)
*/
@ApiModelProperty(value = "结束日期(yyyy-MM-dd)")
private Date endDate;
/**
* 页码
*/
@ApiModelProperty("页码")
private Integer pageNum;
/**
* 页面大小
*/
@ApiModelProperty("页面大小")
private Integer pageSize;
}

12
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ResidentServiceApplyVo.java
View File

@ -155,16 +155,4 @@ public class ResidentServiceApplyVo {
@ApiModelProperty("签约编号")
private String signNo;
/**
* 评价编号
*/
@ApiModelProperty("评价编号")
private String evaluateNo;
/**
* 服务评价对象
*/
@ApiModelProperty("服务评价对象")
OrderEvaluateInfoVo orderEvaluateInfo;
}

194
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ResidentServiceRecordVo.java Normal file
View File

@ -0,0 +1,194 @@
package com.xinelu.familydoctor.applet.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xinelu.manage.domain.orderevaluateinfo.OrderEvaluateInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author mengkuiliang
* @Description 服务记录展示类
* @Date 2023-10-17 017 11:32
* @Param
* @return
**/
@ApiModel("服务记录展示类")
@Data
public class ResidentServiceRecordVo {
/**
* 履约业务主键
*/
@ApiModelProperty(value = "履约业务主键")
private String performanceNo;
/**
* 签约编号
*/
@ApiModelProperty(value = "签约编号")
private String signNo;
/**
* 居民编号
*/
@ApiModelProperty(value = "居民编号")
private String residentNo;
/**
* 居民身份证号
*/
@ApiModelProperty(value = "居民身份证号")
private String identity;
/**
* 居民姓名
*/
@ApiModelProperty(value = "居民姓名")
private String residentName;
/**
* 履约明细业务主键
*/
@ApiModelProperty(value = "履约明细业务主键")
private String performanceDetailNo;
/**
* 服务包明细业务主键
*/
@ApiModelProperty(value = "服务包明细业务主键")
private String packageDetailNo;
/**
* 服务包编号
*/
@ApiModelProperty(value = "服务包编号", required = true)
private String packageNo;
/**
* 服务包名称
*/
@ApiModelProperty(value = "服务包名称", required = true)
private String packageName;
/**
* 服务项表单编号
*/
@ApiModelProperty(value = "服务项表单编号")
private String formNo;
/**
* 服务项表单名称
*/
@ApiModelProperty(value = "服务项表单名称")
private String formName;
/**
* 履约时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "履约时间")
private Date performanceTime;
/**
* 随访时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "随访时间")
private Date followupTime;
/**
* 下次履约时间
*/
@ApiModelProperty(value = "下次履约时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date performanceNextTime;
/**
* 机构业务编号
*/
@ApiModelProperty(value = "机构业务编号")
private String orgNo;
/**
* 机构名称
*/
@ApiModelProperty(value = "机构名称", required = true)
private String orgName;
/**
* 团队业务编号
*/
@ApiModelProperty(value = "团队业务编号", required = true)
private String teamNo;
/**
* 团队名称
*/
@ApiModelProperty(value = "团队名称", required = true)
private String teamName;
/**
* 履约医生
*/
@ApiModelProperty(value = "履约医生")
private String userNo;
/**
* 履约医生名称
*/
@ApiModelProperty(value = "履约医生名称")
private String userName;
/**
* 下次随访日期
*/
@ApiModelProperty(value = "下次随访日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date followupNextTime;
/**
* 履约方式（1：家庭，2：门诊，3：电话，99：其他）
*/
@ApiModelProperty(value = "履约方式（1：家庭，2：门诊，3：电话，99：其他）")
private String performanceWay;
/**
* 履约方式名称（1：家庭，2：门诊，3：电话，99：其他）
*/
@ApiModelProperty(value = "履约方式（1：家庭，2：门诊，3：电话，99：其他）")
private String performanceWayName;
/**
* 生成方式（1：手动添加 2：随访自动同步）
*/
@ApiModelProperty(value = "生成方式（1：手动添加 2：随访自动同步）")
private String generateWay;
/**
* 生成方式名称（1：手动添加 2：随访自动同步）
*/
@ApiModelProperty(value = "生成方式（1：手动添加 2：随访自动同步）")
private String generateWayName;
/**
* 应服务次数
*/
@ApiModelProperty(value = "应服务次数")
private Integer serviceFreq;
/**
* 已履约次数
*/
@ApiModelProperty(value = "已履约次数")
private Integer performanceCount;
/**
* 服务评价对象
*/
@ApiModelProperty("服务评价对象")
OrderEvaluateInfo orderEvaluateInfo;
}

8
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
View File

@ -156,6 +156,8 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
BeanUtils.copyBeanProp(patientInfo, body);
if(body.getDiseaseList() != null) {
patientInfo.setDisease(body.getDiseaseList().stream().collect(Collectors.joining(",")));
} else {
patientInfo.setDisease("0");
}
patientInfo.setLoginFlag(Long.valueOf(1));
updatePatientInfo(patientInfo);
@ -169,6 +171,8 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
BeanUtils.copyBeanProp(entity, body);
if(body.getDiseaseList() != null) {
entity.setDisease(body.getDiseaseList().stream().collect(Collectors.joining(",")));
} else {
entity.setDisease("0");
}
entity.setPatientCode(IdUtils.fastSimpleUUID());
entity.setBindingTime(new Date());
@ -194,6 +198,8 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
patientInfo.setLoginFlag(Long.valueOf(1));
if(body.getDiseaseList() != null) {
patientInfo.setDisease(body.getDiseaseList().stream().collect(Collectors.joining(",")));
} else {
patientInfo.setDisease("0");
}
residentPatientInfoMapper.updatePatientInfo(patientInfo);
}
@ -266,7 +272,7 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
**/
@Override
public PatientInfo getCurrentResident(String openid, String cityCode) {
List<PatientInfo> list = residentPatientInfoMapper.getList(openid, cityCode);
List<PatientInfo> list = residentPatientInfoMapper.getList(openid, null);
if (list == null || list.size() == 0) {
return null;
}

28
xinelu-familydoctor/src/main/resources/mapper/register/ResidentPatientInfoMapper.xml
View File

@ -45,6 +45,9 @@
<result property="cityCode" column="city_code"/>
<result property="bindingTime" column="binding_time"/>
<result property="isChecked" column="is_checked"/>
<result property="householdRelationship" column="household_relationship"/>
<result property="householdCardNo" column="household_card_no"/>
</resultMap>
<sql id="selectPatientInfoVo">
@ -87,7 +90,9 @@
disease,
city_code,
binding_time,
is_checked
is_checked,
household_relationship,
household_card_no
from patient_info
</sql>
@ -119,6 +124,9 @@
<if test="isChecked != null and isChecked != ''">
and is_checked = #{isChecked}
</if>
<if test="householdCardNo">
and household_card_no = #{householdCardNo}
</if>
</where>
order by binding_time desc
</select>
@ -207,6 +215,12 @@
</if>
<if test="isChecked != null">is_checked,
</if>
<if test="householdRelationship != null">
household_relationship,
</if>
<if test="householdCardNo != null">
household_card_no,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="areaCode != null">#{areaCode},
@ -286,6 +300,12 @@
</if>
<if test="isChecked != null">#{isChecked},
</if>
<if test="householdRelationship != null">
#{householdRelationship},
</if>
<if test="householdCardNo != null">
#{householdCardNo},
</if>
</trim>
</insert>
@ -406,6 +426,12 @@
<if test="isChecked != null">is_checked =
#{isChecked},
</if>
<if test="householdRelationship != null">
household_relationship = #{householdRelationship},
</if>
<if test="household_card_no != null">
household_card_no = #{householdCardNo},
</if>
</trim>
where patient_code = #{patientCode}
</update>

13
xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/apporderevaluate/OrderEvaluateAndPictureDTO.java
View File

@ -2,6 +2,7 @@ package com.xinelu.applet.dto.apporderevaluate;
import com.xinelu.common.custominterface.Insert;
import com.xinelu.manage.domain.orderevaluatepictureinfo.OrderEvaluatePictureInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -47,6 +48,12 @@ public class OrderEvaluateAndPictureDTO implements Serializable {
@NotBlank(message = "请选择订单编号", groups = {Insert.class})
private String orderNo;
/**
* 服务编号
*/
@ApiModelProperty(value = "服务编号")
private String serviceCode;
/**
* 评价内容
*/
@ -69,6 +76,12 @@ public class OrderEvaluateAndPictureDTO implements Serializable {
@NotNull(message = "请选择评分", groups = {Insert.class})
private Integer compositeScore;
/**
* 订单来源，泉医模块：SPRING_DOCTOR，家医模块：FAMILY_DOCTOR
*/
@ApiModelProperty(value = "订单来源，泉医模块：SPRING_DOCTOR，家医模块：FAMILY_DOCTOR")
private String orderSource;
/**
* 创建时间
*/

1
xinelu-nurse-applet/src/main/resources/mapper/applet/appletlogin/AppletLoginMapper.xml
View File

@ -84,6 +84,7 @@
and openid = #{openId}
</if>
</where>
limit 1
</select>
<select id="getPatientInfoByPatientId" parameterType="long" resultType="patientInfo">

4
xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml
View File

@ -12,10 +12,12 @@
<result property="openid" column="openid"/>
<result property="unionid" column="unionid"/>
<result property="orderNo" column="order_no"/>
<result property="serviceCode" column="service_code"/>
<result property="evaluateContent" column="evaluate_content"/>
<result property="evaluateChannel" column="evaluate_channel"/>
<result property="evaluateSatisfaction" column="evaluate_satisfaction"/>
<result property="compositeScore" column="composite_score"/>
<result property="orderSource" column="order_source"/>
<result property="createTime" column="create_time"/>
<result property="patientName" column="patient_name"/>
<collection property="orderEvaluatePictureInfoList" javaType="java.util.List"
@ -52,10 +54,12 @@
SELECT oei.id orderEvaluateInfoId,
oei.patient_id,
oei.order_no,
oei.service_code,
oei.evaluate_content,
oei.evaluate_channel,
oei.evaluate_satisfaction,
oei.composite_score,
oei.order_source,
oei.create_time,
oepi.evaluate_picture_url,
oepi.create_time,

13
xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/orderevaluateinfo/OrderEvaluateInfo.java
View File

@ -65,6 +65,13 @@ public class OrderEvaluateInfo extends BaseDomain implements Serializable {
@NotBlank(message = "请选择订单编号", groups = {Insert.class})
private String orderNo;
/**
* 服务编号
*/
@ApiModelProperty(value = "服务编号")
@Excel(name = "服务编号")
private String serviceCode;
/**
* 评价内容
*/
@ -96,6 +103,12 @@ public class OrderEvaluateInfo extends BaseDomain implements Serializable {
@NotNull(message = "请选择评分", groups = {Update.class})
private Integer compositeScore;
/**
* 订单来源，泉医模块：SPRING_DOCTOR，家医模块：FAMILY_DOCTOR
*/
@ApiModelProperty(value = "订单来源，泉医模块：SPRING_DOCTOR，家医模块：FAMILY_DOCTOR")
@Excel(name = "订单来源，泉医模块：SPRING_DOCTOR，家医模块：FAMILY_DOCTOR")
private String orderSource;
@Override
public String toString() {

9
xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/orderevaluateinfo/OrderEvaluateInfoMapper.java
View File

@ -62,4 +62,13 @@ public interface OrderEvaluateInfoMapper {
* @return 结果
*/
int deleteOrderEvaluateInfoByIds(Long[] ids);
/**
* @Author mengkuiliang
* @Description 根据服务编号查询服务评价列表
* @Date 2023-10-17 017 11:36
* @Param [serviceNoList]
* @return java.util.List<com.xinelu.manage.domain.orderevaluateinfo.OrderEvaluateInfo>
**/
List<OrderEvaluateInfo> selectOrderEvaluateByServiceNos(@Param("serviceNoList") List<String> serviceNoList, @Param("orderSource") String orderSource);
}

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

@ -54,4 +54,13 @@ public interface IOrderEvaluateInfoService {
*/
int deleteOrderEvaluateInfoByIds(Long[] ids);
}
/**
* @Author mengkuiliang
* @Description 根据服务编号查询服务评价列表
* @Date 2023-10-17 017 11:35
* @Param [orderEvaluateInfo]
* @return java.util.List<com.xinelu.manage.domain.orderevaluateinfo.OrderEvaluateInfo>
**/
List<OrderEvaluateInfo> selectOrderEvaluateByServiceNos(List<String> serviceNoList, String orderSource);
}

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

@ -77,4 +77,16 @@ public class OrderEvaluateInfoServiceImpl implements IOrderEvaluateInfoService {
public int deleteOrderEvaluateInfoByIds(Long[] ids) {
return orderEvaluateInfoMapper.deleteOrderEvaluateInfoByIds(ids);
}
}
/**
* @Author mengkuiliang
* @Description 根据服务编号查询服务评价列表
* @Date 2023-10-17 017 11:36
* @Param [serviceNoList]
* @return java.util.List<com.xinelu.manage.domain.orderevaluateinfo.OrderEvaluateInfo>
**/
@Override
public List<OrderEvaluateInfo> selectOrderEvaluateByServiceNos(List<String> serviceNoList, String orderSource) {
return orderEvaluateInfoMapper.selectOrderEvaluateByServiceNos(serviceNoList, orderSource);
}
}

31
xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluateinfo/OrderEvaluateInfoMapper.xml
View File

@ -10,10 +10,12 @@
<result property="openid" column="openid"/>
<result property="unionid" column="unionid"/>
<result property="orderNo" column="order_no"/>
<result property="serviceCode" column="service_code"/>
<result property="evaluateContent" column="evaluate_content"/>
<result property="evaluateChannel" column="evaluate_channel"/>
<result property="evaluateSatisfaction" column="evaluate_satisfaction"/>
<result property="compositeScore" column="composite_score"/>
<result property="orderSource" column="order_source"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@ -26,10 +28,12 @@
openid,
unionid,
order_no,
service_code,
evaluate_content,
evaluate_channel,
evaluate_satisfaction,
composite_score,
order_source,
create_by,
create_time,
update_by,
@ -64,6 +68,9 @@
<if test="compositeScore != null ">
and composite_score = #{compositeScore}
</if>
<if test="orderSource != null and orderSource != ''">
and order_source = #{orderSource}
</if>
</where>
</select>
@ -78,6 +85,16 @@
</where>
</select>
<!-- 根据服务编号查询服务评价列表 -->
<select id="selectOrderEvaluateByServiceNos" resultType="com.xinelu.manage.domain.orderevaluateinfo.OrderEvaluateInfo">
<include refid="selectOrderEvaluateInfoVo"/>
where service_code in
<foreach collection="serviceNoList" item="no" open="(" separator="," close=")">#{no}</foreach>
<if test="orderSource != null and orderSource != ''">
and order_source = #{orderSource}
</if>
</select>
<insert id="insertOrderEvaluateInfo" parameterType="OrderEvaluateInfo" useGeneratedKeys="true"
keyProperty="id">
insert into order_evaluate_info
@ -92,6 +109,8 @@
</if>
<if test="orderNo != null">order_no,
</if>
<if test="serviceCode != null">service_code,
</if>
<if test="evaluateContent != null">evaluate_content,
</if>
<if test="evaluateChannel != null">evaluate_channel,
@ -100,6 +119,8 @@
</if>
<if test="compositeScore != null">composite_score,
</if>
<if test="orderSource != null">order_source,
</if>
<if test="createBy != null">create_by,
</if>
<if test="createTime != null">create_time,
@ -120,6 +141,8 @@
</if>
<if test="orderNo != null">#{orderNo},
</if>
<if test="serviceCode != null">#{serviceCode},
</if>
<if test="evaluateContent != null">#{evaluateContent},
</if>
<if test="evaluateChannel != null">#{evaluateChannel},
@ -128,6 +151,8 @@
</if>
<if test="compositeScore != null">#{compositeScore},
</if>
<if test="orderSource != null">#{orderSource},
</if>
<if test="createBy != null">#{createBy},
</if>
<if test="createTime != null">#{createTime},
@ -154,6 +179,9 @@
<if test="orderNo != null">order_no =
#{orderNo},
</if>
<if test="serviceCode != null">service_code =
#{serviceCode},
</if>
<if test="evaluateContent != null">evaluate_content =
#{evaluateContent},
</if>
@ -166,6 +194,9 @@
<if test="compositeScore != null">composite_score =
#{compositeScore},
</if>
<if test="orderSource != null">
order_source = #{orderSource},
</if>
<if test="createBy != null">create_by =
#{createBy},
</if>