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

This commit is contained in:
2025-11-11 18:08:44 +08:00
@@ -490,6 +490,7 @@ public class ConDoctorController extends JeecgController<ConDoctor, IConDoctorSe
String name = getCellStringValue(row.getCell(0)); String name = getCellStringValue(row.getCell(0));
doctorVO.setDoctorName(name); doctorVO.setDoctorName(name);
doctorVO.setType("1");
userVO.setRealname(name); userVO.setRealname(name);
String account = getCellStringValue(row.getCell(1)); String account = getCellStringValue(row.getCell(1));
userVO.setUsername(account); userVO.setUsername(account);
@@ -550,8 +551,9 @@ public class ConDoctorController extends JeecgController<ConDoctor, IConDoctorSe
List<DictModel> models = dictUtil.queryDictItemListByCode("z_doct_lev"); List<DictModel> models = dictUtil.queryDictItemListByCode("z_doct_lev");
DictModel dictModel = models.stream().filter(item -> item.getText().equals(zc)).findFirst().orElse(null); DictModel dictModel = models.stream().filter(item -> item.getText().equals(zc)).findFirst().orElse(null);
if (dictModel != null) { if (dictModel != null) {
doctorVO.setDoctorJob(dictModel.getValue()); doctorVO.setDoctorTitle(dictModel.getValue());
} }
doctorVO.setDoctorJob("3");
doctorVO.setGoodAt(getCellStringValue(row.getCell(7))); doctorVO.setGoodAt(getCellStringValue(row.getCell(7)));
doctorVO.setExperience(getCellStringValue(row.getCell(8))); doctorVO.setExperience(getCellStringValue(row.getCell(8)));