Browse Source

20220607v2.1.1送测

bfyMa
zhangye 3 years ago
parent
commit
89891b5f41
  1. 2
      src/main/java/com/ccsens/carbasics/service/ScreeningService.java
  2. 2
      src/main/resources/mapper_dao/QuestionnaireDao.xml

2
src/main/java/com/ccsens/carbasics/service/ScreeningService.java

@ -90,7 +90,7 @@ public class ScreeningService implements IScreeningService {
if("WeiShengYuan".equals(shareQuestionnaire.getPositionCode())){ if("WeiShengYuan".equals(shareQuestionnaire.getPositionCode())){
screeningQrCode = ScreeningQrCodeUtil.getScreeningQrCode(PropUtil.path, qrCode, shareQuestionnaire.getHospitalName(),""); screeningQrCode = ScreeningQrCodeUtil.getScreeningQrCode(PropUtil.path, qrCode, shareQuestionnaire.getHospitalName(),"");
}else { }else {
screeningQrCode = ScreeningQrCodeUtil.getScreeningQrCode(PropUtil.path, qrCode, shareQuestionnaire.getHospitalName(),shareQuestionnaire.getDoctorName()); screeningQrCode = ScreeningQrCodeUtil.getScreeningQrCode(PropUtil.path, qrCode, shareQuestionnaire.getHospitalName(),shareQuestionnaire.getDoctorName() + "医生");
} }
shareQuestionnaire.setQrCode(PropUtil.imgDomain + screeningQrCode); shareQuestionnaire.setQrCode(PropUtil.imgDomain + screeningQrCode);
} }

2
src/main/resources/mapper_dao/QuestionnaireDao.xml

@ -389,7 +389,7 @@
and t.idCard = #{param.idCard} and t.idCard = #{param.idCard}
</if> </if>
<if test="param.name != null and param.name != ''"> <if test="param.name != null and param.name != ''">
and t.`name` like count('%',#{param.name},'%') and t.`name` like CONCAT('%',#{param.name},'%')
</if> </if>
<if test="param.sex != null and param.sex != ''"> <if test="param.sex != null and param.sex != ''">
and t.sex = #{param.sex} and t.sex = #{param.sex}

Loading…
Cancel
Save