|
|
@ -5,11 +5,9 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.yihu.jw.entity.base.patient.BasePatientDO;
|
|
|
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
|
|
|
import com.yihu.jw.entity.base.user.UserDO;
|
|
|
import com.yihu.jw.patient.dao.BasePatientDao;
|
|
|
import com.yihu.jw.patient.util.ConstantUtils;
|
|
|
import com.yihu.mysql.query.BaseJpaService;
|
|
|
import com.yihu.utils.security.MD5;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
@ -111,25 +109,20 @@ public class BasePatientService extends BaseJpaService<BasePatientDO, BasePatien
|
|
|
JSONObject jsonObject = JSONObject.parseObject(jsonData);
|
|
|
JSONObject patient = jsonObject.getJSONObject("patient");
|
|
|
JSONArray patientMedicareCards = jsonObject.getJSONArray("medicareCard");
|
|
|
if(null == patient){
|
|
|
if(null == patient || CollectionUtils.isEmpty(patientMedicareCards)){
|
|
|
return ConstantUtils.FAIL;
|
|
|
}
|
|
|
BasePatientDO basePatientDO = objectMapper.readValue(patient.toJSONString(),BasePatientDO.class);
|
|
|
this.save(basePatientDO);
|
|
|
|
|
|
List<PatientMedicareCardDO> list = new ArrayList<>();
|
|
|
if(!CollectionUtils.isEmpty(patientMedicareCards)){
|
|
|
patientMedicareCards.forEach((one)->{
|
|
|
try {
|
|
|
PatientMedicareCardDO card = objectMapper.readValue(one.toString(),PatientMedicareCardDO.class);
|
|
|
card.setPatientCode(basePatientDO.getId());
|
|
|
list.add(card);
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
});
|
|
|
basePatientMedicardCardService.batchInsert(list);
|
|
|
}
|
|
|
patientMedicareCards.forEach((card)->{
|
|
|
try {
|
|
|
list.add(objectMapper.readValue(card.toString(),PatientMedicareCardDO.class));
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
});
|
|
|
this.save(basePatientDO);
|
|
|
basePatientMedicardCardService.batchInsert(list);
|
|
|
return ConstantUtils.SUCCESS;
|
|
|
}
|
|
|
|
|
|
@ -150,10 +143,7 @@ public class BasePatientService extends BaseJpaService<BasePatientDO, BasePatien
|
|
|
if(StringUtils.isEmpty(basePatientDO.getId())){
|
|
|
return ConstantUtils.FAIL;
|
|
|
}
|
|
|
BasePatientDO oldPatient = basePatientDao.findOne(basePatientDO.getId());
|
|
|
// 保存修改的居民信息
|
|
|
basePatientDO.setSalt(oldPatient.getSalt());
|
|
|
basePatientDO.setPassword(oldPatient.getPassword());
|
|
|
this.save(basePatientDO);
|
|
|
Set<Object> cardIdList = basePatientMedicardCardService.findIdListByPatientCode(basePatientDO.getId());
|
|
|
// 有些卡可能是新增或修改的，一条一条修改居民相关的卡的信息
|
