Merge branch 'dev' of liubing/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/file_upload/FileUploadService.java

@@ -673,7 +673,7 @@ public class FileUploadService {
    public boolean isFileFlag(String type){
        List img = new ArrayList(Arrays.asList("bmp", "jpg", "png", "tif", "gif", "pcx", "tga", "exif", "fpx", "svg", "psd", "cdr", "pcd", "dxf", "ufo", "eps", "ai", "raw", "WMF", "webp","xls","xlsx","text/plain"));
        List img = new ArrayList(Arrays.asList("jpeg","bmp", "jpg", "png", "tif", "gif", "pcx", "tga", "exif", "fpx", "svg", "psd", "cdr", "pcd", "dxf", "ufo", "eps", "ai", "raw", "WMF", "webp","xls","xlsx","text/plain"));
        if (!img.contains(type)) {
            return false;
        }

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -19,13 +19,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
 /*   @GeneratedValue(generator = "generator")
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)*/
    @Column(name = "id", unique = true, nullable = false)
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
//   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/patient/BasePatientEndpoint.java

@@ -360,15 +360,27 @@ public class BasePatientEndpoint extends EnvelopRestEndpoint {
                        packageRecordDO.setTeamCode(teamDO.getId());
                        servicePackageRecordDao.save(packageRecordDO);
                        //建档状态
                        ArchiveDO archiveDO = new ArchiveDO();
                        archiveDO.setCreateTime(new Date());
                        archiveDO.setArchiveOperatorName(doctorDO.getName());
                        archiveDO.setDoctorCode(doctorDO.getId());
                        archiveDO.setPatient(patient);
                        archiveDO.setSickName(name);
                        archiveDO.setIdcard(idcard);
                        archiveDO.setSignStatus(1);
                        archiveDao.save(archiveDO);
                        List<String> teams = new ArrayList<>();
                        teams.add(teamDO.getId());
                        List<BaseDoctorDO> doctorDOS = baseDoctorDao.findDoctorsByTeam(teams);
                        List<ArchiveDO> saveList = new ArrayList<>();
                        for (BaseDoctorDO tmp:doctorDOS){
                            ArchiveDO archiveDO = archiveDao.findByPatientAndDoctorCode(patient,tmp.getId());
                            if(archiveDO!=null){
                                archiveDO.setSignStatus(1);
                            }else{
                                archiveDO = new ArchiveDO();
                                archiveDO.setCreateTime(new Date());
                                archiveDO.setArchiveOperatorName(tmp.getName());
                                archiveDO.setPatient(patient);
                                archiveDO.setSickName(name);
                                archiveDO.setIdcard(idcard);
                                archiveDO.setSignStatus(1);
                                archiveDO.setDoctorCode(tmp.getId());
                            }
                            saveList.add(archiveDO);
                        }
                        archiveDao.save(saveList);
                        //居民标签
                        WlyyPatientLabelDO patientLabelDO = new WlyyPatientLabelDO();
                        patientLabelDO.setCzrq(new Date());

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/activity/ChildActivityRegistrationDao.java

@@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by yeshijie on 2021/10/16.
 */
@@ -17,4 +19,7 @@ public interface ChildActivityRegistrationDao extends PagingAndSortingRepository
    @Query("select a from ChildActivityRegistrationDO a where a.patient = ?1 ")
    ChildActivityRegistrationDO findByPatient(String patient);
    @Query("select a from ChildActivityRegistrationDO a where a.patient = ?1 ")
    List<ChildActivityRegistrationDO> findListByPatient(String patient);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/activity/ChildActivityEndpoint.java

@@ -14,6 +14,8 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Created by yeshijie on 2021/10/16.
 */
@@ -44,8 +46,8 @@ public class ChildActivityEndpoint  extends EnvelopRestEndpoint {
    public ObjEnvelop isActivityRegist(
            @ApiParam(name = "patient", value = "居民code") @RequestParam(value = "patient", required = true) String patient) {
        try{
            ChildActivityRegistrationDO registrationDO = activityRegistrationService.isActivityRegist(patient);
            if(registrationDO==null){
            List<ChildActivityRegistrationDO> registrationDO = activityRegistrationService.isActivityRegist(patient);
            if(registrationDO.size()==0){
                return ObjEnvelop.getSuccess("查询成功",0);
            }else {
                return ObjEnvelop.getSuccess("查询成功",1);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/activity/ChildActivityRegistrationService.java

@@ -67,7 +67,7 @@ public class ChildActivityRegistrationService {
     * @param size
     */
    public PageEnvelop childActivityRegistrationList(String patient,String activityType, int page, int size){
        String sql = "SELECT a.id,a.activity_type activityType,a.patient,p.name,p.sex,p.idcard,p.photo,org.code,org.name,DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_child_activity_registration a " +
        String sql = "SELECT a.id,a.activity_type activityType,a.patient,p.name,p.sex,p.idcard,p.photo,org.code,org.name orgName,DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_child_activity_registration a " +
                "LEFT JOIN base_org org on a.org_code = org.code ,base_patient p " +
                "WHERE a.patient = p.id";
@@ -91,8 +91,8 @@ public class ChildActivityRegistrationService {
    }
    public ChildActivityRegistrationDO isActivityRegist(String patient){
        return childActivityRegistrationDao.findByPatient(patient);
    public List<ChildActivityRegistrationDO> isActivityRegist(String patient){
        return childActivityRegistrationDao.findListByPatient(patient);
    }
    /**

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doctor/CareDoctorService.java

@@ -113,7 +113,7 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
     */
    public Map<String,Object> doctorInfo(String doctorId,String isRole){
        String sql = "SELECT d.id,d.name,d.doctor_level level,d.photo,d.introduce,d.expertise,d.mobile,d.idcard,d.sex,h.dept_code deptCode,h.dept_name deptName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName ";
        sql += " ,h.org_code orgCode,org.address orgAddress,h.org_name orgName from base_doctor d left join base_doctor_hospital h on d.id = h.doctor_code  and h.del = 1" +
        sql += " ,h.org_code orgCode,org.address orgAddress,org.name orgName from base_doctor d left join base_doctor_hospital h on d.id = h.doctor_code  and h.del = 1" +
                " LEFT JOIN base_org org on h.org_code = org.`code`  WHERE d.id = '"+doctorId+"' limit 1 ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        Map<String,Object> map = list.get(0);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ServicePackageService.java

@@ -459,7 +459,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
                List<BaseDoctorDO> doctorDOS = doctorDao.findDoctorsByTeam(teams);
                List<ArchiveDO> saveList = new ArrayList<>();
                for (BaseDoctorDO tmp:doctorDOS){
                    ArchiveDO archiveDO = archiveDao.findByPatientAndDoctorCode(patientId,doctorId);
                    ArchiveDO archiveDO = archiveDao.findByPatientAndDoctorCode(patientId,tmp.getId());
                    if(archiveDO!=null){
                        archiveDO.setSignStatus(1);
                    }else{
@@ -470,6 +470,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
                        archiveDO.setSickName(patientDO.getName());
                        archiveDO.setIdcard(patientDO.getIdcard());
                        archiveDO.setSignStatus(1);
                        archiveDO.setDoctorCode(tmp.getId());
                    }
                    saveList.add(archiveDO);
                }